Change the search

browser/app/profile/mypal.js

@@ -1159,7 +1159,6 @@ pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highli
 pref("services.sync.prefs.sync.browser.newtabpage.enabled", true);
 pref("services.sync.prefs.sync.browser.newtabpage.pinned", true);
 pref("services.sync.prefs.sync.browser.offline-apps.notify", true);
-pref("services.sync.prefs.sync.browser.search.update", true);
 pref("services.sync.prefs.sync.browser.sessionstore.restore_on_demand", true);
 pref("services.sync.prefs.sync.browser.startup.homepage", true);
 pref("services.sync.prefs.sync.browser.startup.page", true);

browser/components/enterprisepolicies/schemas/policies-schema.json

@@ -809,9 +809,6 @@
         "browser.safebrowsing.malware.enabled": {
           "type": "boolean"
         },
-        "browser.search.update": {
-          "type": "boolean"
-        },
         "browser.tabs.warnOnClose": {
           "type": "boolean"
         },

browser/components/preferences/in-content/jar.mn

@@ -8,7 +8,7 @@ browser.jar:
 *  content/browser/preferences/in-content/preferences.xul
    content/browser/preferences/in-content/subdialogs.js
 
-   content/browser/preferences/in-content/main.js
+*  content/browser/preferences/in-content/main.js
    content/browser/preferences/in-content/home.js
    content/browser/preferences/in-content/search.js
    content/browser/preferences/in-content/privacy.js

browser/components/preferences/in-content/main.js

@@ -183,7 +183,6 @@ Preferences.addAll([
 
   // Update
   { id: "browser.preferences.advanced.selectedTabIndex", type: "int" },
-  { id: "browser.search.update", type: "bool" },
 
   { id: "privacy.userContext.enabled", type: "bool" },
 ]);
@@ -519,11 +518,13 @@ var gMainPane = {
     let arch = bundle.GetStringFromName(archResource);
     version += ` (${arch})`;
 
+#ifdef MOZ_UPDATER
     document.l10n.setAttributes(
       document.getElementById("updateAppInfo"),
       "update-application-version",
       { version }
     );
+#endif
 
     // Show a release notes link if we have a URL.
     let relNotesLink = document.getElementById("releasenotes");

browser/components/preferences/in-content/main.xul

@@ -407,6 +407,7 @@
   <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
 #endif
 
+#ifdef MOZ_UPDATER
 <hbox id="updatesCategory"
       class="subcategory"
       hidden="true"
@@ -427,7 +428,6 @@
       <description id="distribution" class="text-blurb" hidden="true"/>
       <description id="distributionId" class="text-blurb" hidden="true"/>
     </vbox>
-#ifdef MOZ_UPDATER
     <spacer flex="1"/>
     <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
     <vbox>
@@ -441,9 +441,7 @@
                 history-intro
               "/>
     </vbox>
-#endif
   </hbox>
-#ifdef MOZ_UPDATER
   <vbox id="updateBox">
     <deck id="updateDeck" orient="vertical">
       <hbox id="checkForUpdates" align="start">
@@ -533,9 +531,6 @@
       </hbox>
     </deck>
   </vbox>
-#endif
-
-#ifdef MOZ_UPDATER
   <description id="updateAllowDescription" data-l10n-id="update-application-allow-description"></description>
   <vbox id="updateSettingsContainer">
     <radiogroup id="updateRadioGroup">
@@ -555,11 +550,8 @@
             data-l10n-id="update-application-use-service"
             preference="app.update.service.enabled"/>
 #endif
-#endif
-  <checkbox id="enableSearchUpdate"
-            data-l10n-id="update-enable-search-update"
-            preference="browser.search.update"/>
 </groupbox>
+#endif
 
 <hbox id="performanceCategory"
       class="subcategory"

browser/components/preferences/in-content/tests/browser_advanced_update.js

@@ -77,10 +77,6 @@ const mockUpdateManager = {
   ],
 };
 
-function resetPreferences() {
-  Services.prefs.clearUserPref("browser.search.update");
-}
-
 function formatInstallDate(sec) {
   var date = new Date(sec);
   const dtOptions = {
@@ -96,26 +92,6 @@ function formatInstallDate(sec) {
 
 registerCleanupFunction(resetPreferences);
 
-add_task(async function() {
-  await openPreferencesViaOpenPreferencesAPI("general", { leaveOpen: true });
-  resetPreferences();
-  Services.prefs.setBoolPref("browser.search.update", false);
-
-  let doc = gBrowser.selectedBrowser.contentDocument;
-  let enableSearchUpdate = doc.getElementById("enableSearchUpdate");
-  is_element_visible(
-    enableSearchUpdate,
-    "Check search update preference is visible"
-  );
-
-  // Ensure that the update pref dialog reflects the actual pref value.
-  ok(!enableSearchUpdate.checked, "Ensure search updates are disabled");
-  Services.prefs.setBoolPref("browser.search.update", true);
-  ok(enableSearchUpdate.checked, "Ensure search updates are enabled");
-
-  gBrowser.removeCurrentTab();
-});
-
 add_task(async function() {
   await openPreferencesViaOpenPreferencesAPI("general", { leaveOpen: true });
   let doc = gBrowser.selectedBrowser.contentDocument;