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 209693 d09f5f86a80354563a0272758fd67ff84ef2501d
parent 209692 86abd23340f0196747b9c844d89b161c0507a69b
child 209694 63778f703ab45f0529ab099933d1ccd8fc1fcf5e
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersMattN
bugs1071272, 1071259, 1071247
milestone35.0a1
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
@@ -735,23 +735,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();