Bug 1035557 - Migrate crash checkpoints with the session so that we don't appear to crash during reset. r=ttaubert

--HG--
extra : rebase_source : 29fd4cccaf53a4011d8022b733e83eb1d7f25aaf
extra : histedit_source : c0bb058cd59087c126e2462d596f6b72db9d0de1
This commit is contained in:
Steven MacLeod 2014-08-11 16:41:27 -04:00
parent 84deee2d2a
commit eac07cd035

View File

@ -87,12 +87,14 @@ FirefoxProfileMigrator.prototype.getResources = function() {
[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;
if (sessionFile) {
session = {
type: types.SESSION,
migrate: function(aCallback) {
sessionCheckpoints.copyTo(currentProfileDir, "sessionCheckpoints.json");
let newSessionFile = currentProfileDir.clone();
newSessionFile.append("sessionstore.js");
let migrationPromise = SessionMigration.migrate(sessionFile.path, newSessionFile.path);