From 461878052c9278e2bcc3a8a369c0b6176daced3e Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Tue, 24 Jan 2017 18:34:08 +0100
Subject: [PATCH] Backed out changeset ccc602619a07 (bug 1332993) for failing
 xpcshell test test_accounts.js at least on Linux. r=backout on a CLOSED TREE

---
 services/fxaccounts/FxAccountsProfile.jsm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/services/fxaccounts/FxAccountsProfile.jsm b/services/fxaccounts/FxAccountsProfile.jsm
index c1e70ba49266..ddf9676dbf55 100644
--- a/services/fxaccounts/FxAccountsProfile.jsm
+++ b/services/fxaccounts/FxAccountsProfile.jsm
@@ -72,6 +72,7 @@ this.FxAccountsProfile.prototype = {
 
   // Cache fetched data and send out a notification so that UI can update.
   _cacheProfile(response) {
+    this._cachedAt = Date.now();
     let profileCache = {
       profile: response.body,
       etag: response.etag
@@ -89,10 +90,6 @@ this.FxAccountsProfile.prototype = {
   },
 
   _fetchAndCacheProfileInternal() {
-    let onFinally = () => {
-      this._cachedAt = Date.now();
-      this._currentFetchPromise = null;
-    }
     return this.fxa.getProfileCache()
       .then(profileCache => {
         const etag = profileCache ? profileCache.etag : null;
@@ -102,13 +99,11 @@ this.FxAccountsProfile.prototype = {
         return this._cacheProfile(response);
       })
       .then(body => { // finally block
-        onFinally();
+        this._currentFetchPromise = null;
         return body;
-      }, err => {
-        onFinally();
-        if (err.code != 304) { // fetchProfile() throws when the profile wasn't modified
-          throw e;
-        }
+      }, e => {
+        this._currentFetchPromise = null;
+        throw e;
       });
   },
 
@@ -130,7 +125,8 @@ this.FxAccountsProfile.prototype = {
             // Note that _fetchAndCacheProfile isn't returned, so continues
             // in the background.
             this._fetchAndCacheProfile().catch(err => {
-              log.error("Background refresh of profile failed", err);
+              log.error("Background refresh of profile failed, bumping _cachedAt", err);
+              this._cachedAt = Date.now();
             });
           } else {
             log.trace("not checking freshness of profile as it remains recent");