Bug 972196 - Copy signedInUser.json on Firefox reset to keep sync working. r=MattN, a=sledru
authorMark Hammond <mhammond@skippinet.com.au>
Mon, 05 Jan 2015 09:05:14 +1100
changeset 242687 5e0e3796c76f82af68f14179a2f1f1163014ac6e
parent 242686 4b0a66e14c00e595d607c70534385184c6fda947
child 242688 bb82ebe52d92512ee0f3424ece5a675e4c382415
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN, sledru
bugs972196
milestone36.0a2
Bug 972196 - Copy signedInUser.json on Firefox reset to keep sync working. r=MattN, a=sledru
browser/components/migration/FirefoxProfileMigrator.js
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/browser/components/migration/FirefoxProfileMigrator.js
@@ -91,17 +91,18 @@ FirefoxProfileMigrator.prototype._getRes
       }
     };
   }.bind(this);
 
   let types = MigrationUtils.resourceTypes;
   let places = getFileResource(types.HISTORY, ["places.sqlite"]);
   let cookies = getFileResource(types.COOKIES, ["cookies.sqlite"]);
   let passwords = getFileResource(types.PASSWORDS,
-                                  ["signons.sqlite", "logins.json", "key3.db"]);
+                                  ["signons.sqlite", "logins.json", "key3.db",
+                                   "signedInUser.json"]);
   let formData = getFileResource(types.FORMDATA, ["formhistory.sqlite"]);
   let bookmarksBackups = getFileResource(types.OTHERDATA,
     [PlacesBackups.profileRelativeFolderPath]);
   let dictionary = getFileResource(types.OTHERDATA, ["persdict.dat"]);
 
   let sessionCheckpoints = this._getFileObject(sourceProfileDir, "sessionCheckpoints.json");
   let sessionFile = this._getFileObject(sourceProfileDir, "sessionstore.js");
   let session;