summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@wolfbeast.com>2019-01-14 20:21:16 +0100
committerGitHub <noreply@github.com>2019-01-14 20:21:16 +0100
commitfb1d4c9712eb1898d89f90edfc6120ff169e6357 (patch)
tree677d602abee695200146c4d51ba8db10146bc38c /extensions
parentf38edc94a31de3bae839cf63ed57c3851908ac46 (diff)
parent6335404642a019df481275f4f290ea76b4d8f597 (diff)
downloadUXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar
UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.gz
UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.lz
UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.tar.xz
UXP-fb1d4c9712eb1898d89f90edfc6120ff169e6357.zip
Merge pull request #929 from adeshkp/remove-telemetry-stubs
Telemetry: Remove stubs and related code
Diffstat (limited to 'extensions')
-rw-r--r--extensions/cookie/nsPermissionManager.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
index 2c2e2d79c..afdaea63f 100644
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -37,7 +37,6 @@
#include "mozilla/net/NeckoMessageUtils.h"
#include "mozilla/Preferences.h"
#include "nsReadLine.h"
-#include "mozilla/Telemetry.h"
#include "nsIConsoleService.h"
#include "nsINavHistoryService.h"
#include "nsToolkitCompsCID.h"
@@ -1167,21 +1166,7 @@ nsPermissionManager::InitDB(bool aRemoveFile)
mDBConn->TableExists(NS_LITERAL_CSTRING("moz_perms"), &permsTableExists);
if (permsTableExists) {
// The user already had a moz_perms table, and we are performing a
- // re-migration. We count the rows in the old table for telemetry,
- // and then back up their old database as moz_perms_v6
-
- nsCOMPtr<mozIStorageStatement> countStmt;
- rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("SELECT COUNT(*) FROM moz_perms"),
- getter_AddRefs(countStmt));
- bool hasResult = false;
- if (NS_SUCCEEDED(rv) &&
- NS_SUCCEEDED(countStmt->ExecuteStep(&hasResult)) &&
- hasResult) {
- // Telemetry STUB (count rows and report)
- } else {
- NS_WARNING("Could not count the rows in moz_perms");
- }
-
+ // re-migration.
// Back up the old moz_perms database as moz_perms_v6 before we
// move the new table into its position
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(