Bug 1388611 - Preserve .sqlite-wal files with a Firefox Reset. r=mak
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Thu, 31 Aug 2017 00:38:55 -0700
changeset 378027 25801e787df453260f00d106d29816109eac9557
parent 378026 2d2bb8bc3b2ddde10bed7a65d22d447164a45cec
child 378028 250d13bd254cb6aae1caf2d5973c16846027e8e8
push id50158
push usermozilla@noorenberghe.ca
push dateThu, 31 Aug 2017 18:29:33 +0000
treeherderautoland@25801e787df4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1388611
milestone57.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 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,