Backed out changeset 023371c245a7 (bug 1226616) for not working as intended a=backout
authorCiure Andrei <aciure@mozilla.com>
Mon, 27 Nov 2017 12:27:12 +0200
changeset 442513 24ed530c9a036f8a706743b8f93f2b7f493256be
parent 442512 780900bb90913f473e7722568dc62fa22e82d3aa
child 442514 ee921fb100b395920f8a5cdcb0c92f070d56aa33
push id8238
push useraciure@mozilla.com
push dateMon, 27 Nov 2017 10:33:36 +0000
treeherdermozilla-beta@24ed530c9a03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1226616
milestone58.0
backs out023371c245a797cba08dd444bc0cbd83bbb17a3c
Backed out changeset 023371c245a7 (bug 1226616) for not working as intended a=backout
modules/libpref/Preferences.cpp
toolkit/components/telemetry/Scalars.yaml
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -3577,18 +3577,16 @@ Preferences::GetInstanceForService()
 
   } else {
     // Check if there is a deployment configuration file. If so, set up the
     // pref config machinery, which will actually read the file.
     nsAutoCString lockFileName;
     nsresult rv =
       PREF_GetCStringPref("general.config.filename", lockFileName, false);
     if (NS_SUCCEEDED(rv)) {
-            Telemetry::ScalarSet(Telemetry::ScalarID::GENERAL_AUTOCONFIG_HAS_FILENAME,
-                                 true);
       NS_CreateServicesFromCategory(
         "pref-config-startup",
         static_cast<nsISupports*>(static_cast<void*>(sPreferences)),
         "pref-config-startup");
     }
 
     nsCOMPtr<nsIObserverService> observerService =
       mozilla::services::GetObserverService();
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -437,31 +437,16 @@ storage.sync.api.usage:
     kind: uint
     keyed: true
     notification_emails:
       - eglassercamp@mozilla.com
     release_channel_collection: opt-out
     record_in_processes:
       - main
 
-general.autoconfig:
-  has_filename:
-    bug_numbers:
-      - 1226616
-    description: >
-      Recorded on startup. Boolean stating whether the
-      general.autoconfig.filename preference has a value.
-    expires: never
-    kind: boolean
-    notification_emails:
-      - florian@mozilla.com
-    release_channel_collection: opt-out
-    record_in_processes:
-      - 'main'
-
 services.sync:
   fxa_verification_method:
     bug_numbers:
       - 1353645
     description: >
       The method we used ("push" or "poll") to determine the verification of a
       Firefox Account email.
     expires: "60"