Bug 1531902: Enable launcher process pref on beta; r=mhowell
☠☠ backed out by 58880f0cc809 ☠ ☠
authorAaron Klotz <aklotz@mozilla.com>
Tue, 05 Mar 2019 20:19:43 +0000
changeset 520325 b6e605718832c9bec3bb18933f3da8a286843efa
parent 520324 ff14d3c64e53dad7b4720c983b8f19bb494ed28a
child 520326 077c740cc12037cf93b673e8786c2ae96f03e4c0
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell
bugs1531902
milestone67.0a1
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
Bug 1531902: Enable launcher process pref on beta; r=mhowell Differential Revision: https://phabricator.services.mozilla.com/D21789
browser/app/profile/firefox.js
toolkit/xre/nsAppRunner.cpp
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1828,18 +1828,18 @@ pref("browser.discovery.enabled", true);
 pref("browser.discovery.containers.enabled", true);
 pref("browser.discovery.sites", "addons.mozilla.org");
 
 pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
 
 pref("browser.aboutConfig.showWarning", true);
 
 #if defined(XP_WIN) && defined(MOZ_LAUNCHER_PROCESS)
-#if defined(NIGHTLY_BUILD)
+#if defined(NIGHTLY_BUILD) || (MOZ_UPDATE_CHANNEL == beta)
 // Enable launcher process by default on Nightly
 pref("browser.launcherProcess.enabled", true);
 #else
 // Launcher process is disabled by default, will be selectively enabled via SHIELD
 pref("browser.launcherProcess.enabled", false);
-#endif  // defined(NIGHTLY_BUILD)
-#endif // defined(XP_WIN) && defined(MOZ_LAUNCHER_PROCESS)
+#endif  // defined(NIGHTLY_BUILD) || (MOZ_UPDATE_CHANNEL == beta)
+#endif  // defined(XP_WIN) && defined(MOZ_LAUNCHER_PROCESS)
 
 pref("browser.toolbars.keyboard_navigation", false);
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1680,22 +1680,22 @@ static void OnLauncherPrefChanged(const 
       launcherRegInfo.ReflectPrefToRegistry(prefVal);
   MOZ_ASSERT(reflectResult.isOk());
 }
 
 static void SetupLauncherProcessPref() {
   // In addition to the launcher pref itself, we also tie the launcher process
   // state to the SHIELD opt-out pref.
 
-#    if defined(NIGHTLY_BUILD)
+#    if defined(NIGHTLY_BUILD) || (MOZ_UPDATE_CHANNEL == beta)
   // On Nightly, fire the callback immediately to ensure the pref is reflected
   // to the registry and we get immediate enablement of the launcher process
   // for all users.
   Preferences::RegisterCallbackAndCall(&OnLauncherPrefChanged, kShieldPrefName);
-#    endif  // defined(NIGHTLY_BUILD)
+#    endif  // defined(NIGHTLY_BUILD) || (MOZ_UPDATE_CHANNEL == beta)
 
   mozilla::LauncherRegistryInfo launcherRegInfo;
 
   mozilla::LauncherResult<mozilla::LauncherRegistryInfo::EnabledState>
       enabledState = launcherRegInfo.IsEnabled();
 
   if (enabledState.isOk()) {
     Preferences::SetBool(
@@ -1705,21 +1705,21 @@ static void SetupLauncherProcessPref() {
 
     CrashReporter::AnnotateCrashReport(
         CrashReporter::Annotation::LauncherProcessState,
         static_cast<uint32_t>(enabledState.unwrap()));
   }
 
   Preferences::RegisterCallback(&OnLauncherPrefChanged,
                                 PREF_WIN_LAUNCHER_PROCESS_ENABLED);
-#    if !defined(NIGHTLY_BUILD)
+#    if !defined(NIGHTLY_BUILD) && (MOZ_UPDATE_CHANNEL != beta)
   // We register for SHIELD notifications, but we don't fire the callback
   // immediately in the non-Nightly case.
   Preferences::RegisterCallback(&OnLauncherPrefChanged, kShieldPrefName);
-#    endif  // !defined(NIGHTLY_BUILD)
+#    endif  // !defined(NIGHTLY_BUILD) && (MOZ_UPDATE_CHANNEL != beta)
 }
 
 #  endif  // defined(MOZ_LAUNCHER_PROCESS)
 
 #endif  // XP_WIN
 
 // If aBlankCommandLine is true, then the application will be launched with a
 // blank command line instead of being launched with the same command line that