Bug 1388611 - Preserve .sqlite-wal files with a Firefox Reset. r=mak draft
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Thu, 31 Aug 2017 00:38:55 -0700
changeset 656427 a4918136167889674921e552bdde92ced3c7d6bf
parent 656418 6d438aa8d4d810449ee2b4fc415afc3e468bbd2e
child 729152 dc27bfcb743cfae044b52ebe3eb8c51f43604c4b
push id77226
push usermozilla@noorenberghe.ca
push dateThu, 31 Aug 2017 07:40:01 +0000
reviewersmak
bugs1388611
milestone57.0a1
Bug 1388611 - Preserve .sqlite-wal files with a Firefox Reset. r=mak MozReview-Commit-ID: At6IY39uNPt
browser/components/migration/FirefoxProfileMigrator.js
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/browser/components/migration/FirefoxProfileMigrator.js
@@ -122,19 +122,19 @@ FirefoxProfileMigrator.prototype._getRes
           file.copyTo(currentProfileDir, "");
         }
         aCallback(true);
       }
     };
   };
 
   let types = MigrationUtils.resourceTypes;
-  let places = getFileResource(types.HISTORY, ["places.sqlite"]);
-  let favicons = getFileResource(types.HISTORY, ["favicons.sqlite"]);
-  let cookies = getFileResource(types.COOKIES, ["cookies.sqlite"]);
+  let places = getFileResource(types.HISTORY, ["places.sqlite", "places.sqlite-wal"]);
+  let favicons = getFileResource(types.HISTORY, ["favicons.sqlite", "favicons.sqlite-wal"]);
+  let cookies = getFileResource(types.COOKIES, ["cookies.sqlite", "cookies.sqlite-wal"]);
   let passwords = getFileResource(types.PASSWORDS,
     ["signons.sqlite", "logins.json", "key3.db", "key4.db",
      "signedInUser.json"]);
   let formData = getFileResource(types.FORMDATA, [
     "formhistory.sqlite",
     "autofill-profiles.json",
   ]);
   let bookmarksBackups = getFileResource(types.OTHERDATA,