Issue %3029 - Part 5: Remove remaining telemetry structs, callers and flags.

3 files changed, 0 insertions, 47 deletions

diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 3abd09c7e..5f17125da 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -88,8 +88,6 @@ static nsresult pref_InitInitialObjects(void);
 static nsresult pref_LoadPrefsInDirList(const char *listId);
 static nsresult ReadExtensionPrefs(nsIFile *aFile);
 
-static const char kTelemetryPref[] = "toolkit.telemetry.enabled";
-static const char kOldTelemetryPref[] = "toolkit.telemetry.enabledPreRelease";
 static const char kChannelPref[] = "app.update.channel";
 
 static const char kPrefFileHeader[] =
@@ -644,12 +642,6 @@ Preferences::ReadUserPrefs(nsIFile *aFile)
     // Ignore all errors related to it, so we retain 'rv' value :-|
     (void) UseUserPrefFile();
 
-    // Migrate the old prerelease telemetry pref
-    if (!Preferences::GetBool(kOldTelemetryPref, true)) {
-      Preferences::SetBool(kTelemetryPref, false);
-      Preferences::ClearUser(kOldTelemetryPref);
-    }
-
     NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);
   } else {
     rv = ReadAndOwnUserPrefFile(aFile);
@@ -1336,23 +1328,6 @@ static nsresult pref_InitInitialObjects()
   rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Set up the correct default for toolkit.telemetry.enabled.
-  // If this build has MOZ_TELEMETRY_ON_BY_DEFAULT *or* we're on the beta
-  // channel, telemetry is on by default, otherwise not. This is necessary
-  // so that beta users who are testing final release builds don't flipflop
-  // defaults.
-  if (Preferences::GetDefaultType(kTelemetryPref) == nsIPrefBranch::PREF_INVALID) {
-    bool prerelease = false;
-#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
-    prerelease = true;
-#else
-    if (Preferences::GetDefaultCString(kChannelPref).EqualsLiteral("beta")) {
-      prerelease = true;
-    }
-#endif
-    PREF_SetBoolPref(kTelemetryPref, prerelease, true);
-  }
-
   NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
                                 nullptr, NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID);
 
diff --git a/modules/libpref/goanna.js b/modules/libpref/goanna.js
index ed592af05..a0685b7fb 100644
--- a/modules/libpref/goanna.js
+++ b/modules/libpref/goanna.js
@@ -1,8 +1,2 @@
 #include ../../netwerk/base/security-prefs.js
 #include init/all.js
-#ifdef MOZ_DATA_REPORTING
-#include ../../toolkit/components/telemetry/datareporting-prefs.js
-#endif
-#ifdef MOZ_SERVICES_HEALTHREPORT
-#include ../../toolkit/components/telemetry/healthreport-prefs.js
-#endif
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index b2dc7dde3..9e0fdac5d 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -894,19 +894,6 @@ pref("toolkit.scrollbox.verticalScrollDistance", 3);
 pref("toolkit.scrollbox.horizontalScrollDistance", 5);
 pref("toolkit.scrollbox.clickToScroll.scrollDelay", 150);
 
-// Telemetry settings.
-// Server to submit telemetry pings to.
-pref("toolkit.telemetry.server", "");
-// Telemetry server owner. Please change if you set toolkit.telemetry.server to a different server
-pref("toolkit.telemetry.server_owner", "");
-// Information page about telemetry (temporary ; will be about:telemetry in the end)
-pref("toolkit.telemetry.infoURL", "");
-// Determines whether full SQL strings are returned when they might contain sensitive info
-// i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
-pref("toolkit.telemetry.debugSlowSql", false);
-// Whether to use the unified telemetry behavior, requires a restart.
-pref("toolkit.telemetry.unified", false);
-
 // Identity module
 pref("toolkit.identity.enabled", false);
 pref("toolkit.identity.debug", false);
@@ -982,9 +969,6 @@ pref("devtools.gcli.imgurUploadURL", "https://api.imgur.com/3/image");
 // GCLI commands directory
 pref("devtools.commands.dir", "");
 
-// Allows setting the performance marks for which telemetry metrics will be recorded.
-pref("devtools.telemetry.supported_performance_marks", "contentInteractive,navigationInteractive,navigationLoaded,visuallyLoaded,fullyLoaded,mediaEnumerated,scanEnd");
-
 // Deprecation warnings after DevTools file migration.
 pref("devtools.migration.warnings", true);