Backed out changeset 1603e2488c32 as this patch for bug 1226616 didn't work
authorFlorian Quèze <florian@queze.net>
Sat, 25 Nov 2017 00:01:07 +0100
changeset 393614 3d72084b1e1b7f8a89d1f5081aec7ab8e7fccdcb
parent 393613 4ce67352b2a9744ac51f0333cea0455e3d59bbf3
child 393615 76c8206c543712966580ad91bbc04af636e9cfc9
push id97686
push userflorian@queze.net
push dateFri, 24 Nov 2017 23:02:41 +0000
treeherdermozilla-inbound@76c8206c5437 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1226616
milestone59.0a1
backs out1603e2488c32ef4f37527bee7fd15ae85401108a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1603e2488c32 as this patch for bug 1226616 didn't work
modules/libpref/Preferences.cpp
toolkit/components/telemetry/Scalars.yaml
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -3259,18 +3259,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 = Preferences::GetCString(
       "general.config.filename", lockFileName, PrefValueKind::User);
     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"