Bug 1071272 - Remove the clearUserPref("loop.hawk-session-token.fxa") hack from bug 1071259 since 1071247 has been deployed. r=MattN
authorJared Wein <jwein@mozilla.com>
Thu, 09 Oct 2014 14:08:58 -0400
changeset 225600 c3241c873fb2945d5c092b57c88c90a66cd35de8
parent 225599 1a999d18d96b27b4eae708b28ad78bb35e8c686e
child 225601 2db78559415aa9247d0a0519f79e60b4e56e5e32
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN
bugs1071272, 1071259, 1071247
milestone34.0a2
Bug 1071272 - Remove the clearUserPref("loop.hawk-session-token.fxa") hack from bug 1071259 since 1071247 has been deployed. r=MattN
browser/components/nsBrowserGlue.js
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -724,23 +724,16 @@ BrowserGlue.prototype = {
     WebappManager.uninit();
 #ifdef NIGHTLY_BUILD
     if (Services.prefs.getBoolPref("dom.identity.enabled")) {
       SignInToWebsiteUX.uninit();
     }
 #endif
     webrtcUI.uninit();
     FormValidationHandler.uninit();
-
-     // XXX: Temporary hack to allow Loop FxA login after a restart to work.
-     // Remove this once bug 1071247 is deployed.
-    if (Services.prefs.getPrefType("loop.autologin-after-restart") != Ci.nsIPrefBranch.PREF_BOOL ||
-        !Services.prefs.getBoolPref("loop.autologin-after-restart")) {
-      Services.prefs.clearUserPref("loop.hawk-session-token.fxa");
-    }
   },
 
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();