Bug 1576160 - Turn on the display of default private search engine feature for nightly/early beta users. r=mak
authorMark Banner <standard8@mozilla.com>
Fri, 11 Oct 2019 07:22:23 +0000
changeset 497288 dd505f86478140e9876367ab5a6e19c453e792a7
parent 497287 c7f931c95c789a1b997941f16ee53eb5a942f3f1
child 497289 a8ea98346a87402b1c3ad4c892694d0de163a0b3
push id36681
push usercbrindusan@mozilla.com
push dateFri, 11 Oct 2019 21:50:12 +0000
treeherdermozilla-central@c5e6477c3a24 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1576160
milestone71.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 1576160 - Turn on the display of default private search engine feature for nightly/early beta users. r=mak Differential Revision: https://phabricator.services.mozilla.com/D47223
browser/app/profile/firefox.js
browser/components/extensions/test/xpcshell/test_ext_urlbar.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -386,17 +386,21 @@ pref("browser.search.context.loadInBackg
 // comma seperated list of of engines to hide in the search panel.
 pref("browser.search.hiddenOneOffs", "");
 
 // Mirrors whether the search-container widget is in the navigation toolbar.
 pref("browser.search.widget.inNavBar", false);
 
 // Enables display of the options for the user using a separate default search
 // engine in private browsing mode.
-pref("browser.search.separatePrivateDefault.ui.enabled", false);
+#ifdef EARLY_BETA_OR_EARLIER
+  pref("browser.search.separatePrivateDefault.ui.enabled", true);
+#else
+  pref("browser.search.separatePrivateDefault.ui.enabled", false);
+#endif
 
 pref("browser.sessionhistory.max_entries", 50);
 
 // Built-in default permissions.
 pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions");
 
 // Set default fallback values for site permissions we want
 // the user to be able to globally change.
--- a/browser/components/extensions/test/xpcshell/test_ext_urlbar.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_urlbar.js
@@ -24,16 +24,20 @@ AddonTestUtils.createAppInfo(
 
 const ORIGINAL_NOTIFICATION_TIMEOUT =
   UrlbarProviderExtension.notificationTimeout;
 
 add_task(async function startup() {
   Services.prefs.setCharPref("browser.search.region", "US");
   Services.prefs.setBoolPref("browser.search.geoSpecificDefaults", false);
   Services.prefs.setIntPref("browser.search.addonLoadTimeout", 0);
+  Services.prefs.setBoolPref(
+    "browser.search.separatePrivateDefault.ui.enabled",
+    false
+  );
   await AddonTestUtils.promiseStartupManager();
 
   // Add a test engine and make it default so that when we do searches below,
   // Firefox doesn't try to include search suggestions from the actual default
   // engine from over the network.
   let engine = await Services.search.addEngineWithDetails("Test engine", {
     template: "http://example.com/?s=%S",
     alias: "@testengine",