Bug 1129607 - Init the search service earlier so the country code is fetched before we attempt to get the engine list r=margaret a=sylvestre
authorMark Finkle <mfinkle@mozilla.com>
Fri, 06 Feb 2015 17:13:45 -0500
changeset 243723 c1578e681849
parent 243722 a9eec576bb2c
child 243724 e1faea5d0942
push id4450
push usermfinkle@mozilla.com
push date2015-02-09 17:21 +0000
treeherdermozilla-beta@c1578e681849 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret, sylvestre
bugs1129607
milestone36.0
Bug 1129607 - Init the search service earlier so the country code is fetched before we attempt to get the engine list r=margaret a=sylvestre
mobile/android/chrome/content/browser.js
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -323,16 +323,17 @@ var BrowserApp = {
         BrowserApp.deck.removeEventListener("DOMContentLoaded", BrowserApp_delayedStartup, false);
         Services.obs.notifyObservers(window, "browser-delayed-startup-finished", "");
         Messaging.sendRequest({ type: "Gecko:DelayedStartup" });
 
         // Queue up some other performance-impacting initializations
         Services.tm.mainThread.dispatch(function() {
           // Init LoginManager
           Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
+          Services.search.init();
         }, Ci.nsIThread.DISPATCH_NORMAL);
 
 #ifdef MOZ_SAFE_BROWSING
         Services.tm.mainThread.dispatch(function() {
           // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008.
           SafeBrowsing.init();
         }, Ci.nsIThread.DISPATCH_NORMAL);
 #endif