Bug 1552156: Always set launcher pref default value to false; r=mhowell, a=pascalc
authorAaron Klotz <aklotz@mozilla.com>
Thu, 16 May 2019 16:58:30 +0000
changeset 526551 fa5b6a15761ce4d81f730b756ff595eb91148376
parent 526550 a86de23411340179dde3baa084d29606d6f91030
child 526552 5f21e6f900c825223c2c076cb7cf7f928074ed05
push id2041
push userjcristau@mozilla.com
push dateThu, 16 May 2019 17:34:45 +0000
treeherdermozilla-release@499809263177 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell, pascalc
bugs1552156
milestone67.0
Bug 1552156: Always set launcher pref default value to false; r=mhowell, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D31502
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1529,23 +1529,18 @@ static void RegisterApplicationRestartCh
   }
 }
 
 #  if defined(MOZ_LAUNCHER_PROCESS)
 
 static const char kShieldPrefName[] = "app.shield.optoutstudies.enabled";
 
 static void OnLauncherPrefChanged(const char* aPref, void* aData) {
-  const bool kLauncherPrefDefaultValue =
-#    if defined(NIGHTLY_BUILD) || (MOZ_UPDATE_CHANNEL == beta)
-      true
-#    else
-      false
-#    endif  // defined(NIGHTLY_BUILD) || (MOZ_UPDATE_CHANNEL == beta)
-      ;
+  const bool kLauncherPrefDefaultValue = false;
+
   bool prefVal = Preferences::GetBool(kShieldPrefName, false) &&
                  Preferences::GetBool(PREF_WIN_LAUNCHER_PROCESS_ENABLED,
                                       kLauncherPrefDefaultValue);
 
   mozilla::LauncherRegistryInfo launcherRegInfo;
   mozilla::LauncherVoidResult reflectResult =
       launcherRegInfo.ReflectPrefToRegistry(prefVal);
   MOZ_ASSERT(reflectResult.isOk());