Bug 1376591 - Move SafeBrowsing.init() after startup and put it into IdleDispatch Callback r=florian

MozReview-Commit-ID: E834rSHikYb

--HG--
extra : rebase_source : 4caf9d213009e7e86626d6f54f1096856990709a

browser/base/content/browser.js

@@ -1498,9 +1498,6 @@ var gBrowserInit = {
       }
     }
 
-    // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008.
-    setTimeout(function() { SafeBrowsing.init(); }, 2000);
-
     Services.obs.addObserver(gIdentityHandler, "perm-changed");
     Services.obs.addObserver(gRemoteControl, "remote-active");
     Services.obs.addObserver(gSessionHistoryObserver, "browser:purge-session-history");

browser/components/nsBrowserGlue.js

@@ -20,6 +20,9 @@ XPCOMUtils.defineLazyGetter(this, "WeaveService", () =>
 XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
                                   "resource://gre/modules/ContextualIdentityService.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
+                                  "resource://gre/modules/SafeBrowsing.jsm");
+
 // lazy module getters
 
 /* global AboutHome:false, AboutNewTab:false, AddonManager:false, AppMenuNotifications:false,
@@ -1185,6 +1188,10 @@ BrowserGlue.prototype = {
       ContextualIdentityService.load();
     });
 
+    Services.tm.idleDispatchToMainThread(() => {
+      SafeBrowsing.init();
+    }, 5000);
+
     this._sanitizer.onStartup();
     E10SAccessibilityCheck.onWindowsRestored();
   },