Bug 972196 - copy signedInUser.json on Firefox reset to keep sync working. r=MattN
authorMark Hammond <mhammond@skippinet.com.au>
Mon, 05 Jan 2015 09:05:14 +1100
changeset 247799 379e016a9f056699add1d74a9fd9c5751b34e123
parent 247771 55f3224d751316ff5b7980b20f6f2b3f1cb74e94
child 247800 c094fd467a5179b226fdf3d34535fa6b109f9439
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN
bugs972196
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 972196 - copy signedInUser.json on Firefox reset to keep sync working. r=MattN
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;