Bug 1415727 - resetToOriginalDefaultEngine should unhide engine. r?florian draft
authorMichael Kaply <mozilla@kaply.com>
Tue, 05 Dec 2017 09:08:07 -0600
changeset 707580 88bf6e5ae72e89e8b49fe3bd0d86b68e412b0f2f
parent 703832 5d86a025b8ceda6ede45de2746983e339a2558e6
child 742986 c310bfe4e00fe2e56e13d2660639715a95bafc40
push id92163
push usermozilla@kaply.com
push dateTue, 05 Dec 2017 15:08:23 +0000
reviewersflorian
bugs1415727
milestone59.0a1
Bug 1415727 - resetToOriginalDefaultEngine should unhide engine. r?florian MozReview-Commit-ID: 2Z2osvN3Ir5
browser/components/nsBrowserGlue.js
toolkit/components/search/nsSearchService.js
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2194,21 +2194,17 @@ BrowserGlue.prototype = {
         // Only reset the current engine if it wasn't set by a WebExtension
         // and it is not one of the default engines.
         if (currentEngine._extensionID || currentEngine._isDefault)
           return;
 
         if (currentEngine._loadPath.startsWith("[https]")) {
           Services.prefs.setCharPref("browser.search.reset.status", "pending");
         } else {
-          // Can't call resetToOriginalDefaultEngine because it doesn't
-          // unhide the engine.
-          let defaultEngine = Services.search.originalDefaultEngine;
-          defaultEngine.hidden = false;
-          Services.search.currentEngine = defaultEngine;
+          Services.search.resetToOriginalDefaultEngine();
           Services.prefs.setCharPref("browser.search.reset.status", "silent");
         }
       });
     }
 
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -2829,17 +2829,19 @@ SearchService.prototype = {
         // getEngineByName will just return null, which is the best we can do.
       }
     }
 
     return this.getEngineByName(defaultEngine);
   },
 
   resetToOriginalDefaultEngine: function SRCH_SVC__resetToOriginalDefaultEngine() {
-    this.currentEngine = this.originalDefaultEngine;
+    let originalDefaultEngine = this.originalDefaultEngine;
+    originalDefaultEngine.hidden = false;
+    this.currentEngine = originalDefaultEngine;
   },
 
   _buildCache: function SRCH_SVC__buildCache() {
     if (this._batchTask)
       this._batchTask.disarm();
 
     let cache = {};
     let locale = getLocale();