mozilla-central: changeset 206673:b4c808eb372611caa2291c8602976a0002f738a2

author	Matthew Noorenberghe <mozilla@noorenberghe.ca>
	Mon, 22 Sep 2014 14:43:41 -0700
changeset 206673	b4c808eb372611caa2291c8602976a0002f738a2
parent 206561	603dad513d7c2835fc75371930ef1c9038e7feef
child 206674	70aaf98d3bb0cd6d7ebfd1981a969ec08e784087
push id	27535
push user	ttaubert@mozilla.com
push date	Tue, 23 Sep 2014 13:53:03 +0000
treeherder	mozilla-central@9e193395b912 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jaws
bugs	1071259, 1071247
milestone	35.0a1
first release with	nightly linux32 afc933adf723 / 35.0a1 / 20140923165902 / files nightly linux64 afc933adf723 / 35.0a1 / 20140923165902 / files nightly mac afc933adf723 / 35.0a1 / 20140923165902 / files nightly win32 afc933adf723 / 35.0a1 / 20140923165902 / files nightly win64 afc933adf723 / 35.0a1 / 20140923165902 / files
last release without	nightly linux32 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly linux64 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly mac 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly win32 5bd6e09f074e / 35.0a1 / 20140922030204 / files nightly win64 5bd6e09f074e / 35.0a1 / 20140922030204 / files

--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -736,16 +736,20 @@ 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.
+    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();