Bug 1092808: fix issue with polaris pref observer being registered too early (causing polaris prefs to be reset on restart), r=dolske

--HG--
extra : rebase_source : 5c87b94f621f3bc3c91c9fd918e58de6676c7eb2

browser/components/nsBrowserGlue.js

@@ -502,9 +502,6 @@ BrowserGlue.prototype = {
 #endif
     os.addObserver(this, "browser-search-engine-modified", false);
     os.addObserver(this, "browser-search-service", false);
-#ifdef NIGHTLY_BUILD
-    Services.prefs.addObserver(POLARIS_ENABLED, this, false);
-#endif
   },
 
   // cleanup (called on application shutdown)
@@ -601,6 +598,10 @@ BrowserGlue.prototype = {
 
     LoginManagerParent.init();
 
+#ifdef NIGHTLY_BUILD
+    Services.prefs.addObserver(POLARIS_ENABLED, this, false);
+#endif
+
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
   },