Bug 977177 - Add favicons.sqlite to profile related lists. r=adw,jmhaer draft
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 30 Mar 2017 13:08:05 +0200
changeset 561155 213ff3e89ae978aa1e9bc3993ff51a17481d7789
parent 561154 d3015836abd5f7737cab42a3b102b5d718c692d6
child 561156 d3d59b35ab9a7f2be7c32bdd859b88bf62d1d59b
push id53651
push usermak77@bonardo.net
push dateWed, 12 Apr 2017 09:15:32 +0000
reviewersadw, jmhaer
bugs977177
milestone55.0a1
Bug 977177 - Add favicons.sqlite to profile related lists. r=adw,jmhaer MozReview-Commit-ID: HkYpXQ0UFmd
browser/components/migration/FirefoxProfileMigrator.js
testing/talos/talos/mtio-whitelist.json
testing/talos/talos/xtalos/xperf_whitelist.json
toolkit/components/telemetry/Telemetry.cpp
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/browser/components/migration/FirefoxProfileMigrator.js
@@ -123,16 +123,17 @@ FirefoxProfileMigrator.prototype._getRes
         }
         aCallback(true);
       }
     };
   }.bind(this);
 
   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 passwords = getFileResource(types.PASSWORDS,
     ["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"]);
@@ -235,17 +236,17 @@ FirefoxProfileMigrator.prototype._getRes
         }
       }
 
       aCallback(true);
     }
   };
 
   return [places, cookies, passwords, formData, dictionary, bookmarksBackups,
-          session, times, telemetry].filter(r => r);
+          session, times, telemetry, favicons].filter(r => r);
 };
 
 Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
   get: () => true
 });
 
 
 FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--- a/testing/talos/talos/mtio-whitelist.json
+++ b/testing/talos/talos/mtio-whitelist.json
@@ -93,16 +93,19 @@
  "{profile}\\localstore-1.rdf": {},
  "{profile}\\localstore.rdf": {},
  "{profile}\\pluginreg.dat": {},
  "{profile}\\pluginreg.dat.tmp": {},
  "{profile}\\plugins": {},
  "{profile}\\places.sqlite": {},
  "{profile}\\places.sqlite-journal": {},
  "{profile}\\places.sqlite-wal": {},
+ "{profile}\\favicons.sqlite": {},
+ "{profile}\\favicons.sqlite-journal": {},
+ "{profile}\\favicons.sqlite-wal": {},
  "{profile}\\prefs-1.js": {},
  "{profile}\\prefs.js": {},
  "{profile}\\searchplugins": {},
  "{profile}\\secmod.db": {},
  "{profile}\\startupCache\\startupCache.4.little": {},
  "{profile}\\cache2\\index": {},
  "{profile}\\cache2\\index.log": {},
  "{profile}\\cache2\\index.tmp": {},
--- a/testing/talos/talos/xtalos/xperf_whitelist.json
+++ b/testing/talos/talos/xtalos/xperf_whitelist.json
@@ -46,10 +46,13 @@
  "{profile}\\mimetypes.rdf": {"mincount": 2, "maxcount": 2, "minbytes": 8192, "maxbytes": 8192},
  "{profile}\\prefs-1.js": {"mincount": 0, "maxcount": 10, "minbytes": 0, "maxbytes": 53950},
  "{profile}\\xulstore.json": {"mincount": 0, "maxcount": 0, "minbytes": 0, "maxbytes": 702},
  "{profile}\\secmod.db": {"mincount": 0, "maxcount": 12, "minbytes": 0, "maxbytes": 32768},
  "{profile}\\pluginreg.dat": {"mincount": 2, "maxcount": 2, "minbytes": 1892, "maxbytes": 1892},
  "{firefox}\\defaults\\pref\\channel-prefs.js": {"mincount": 4, "maxcount": 4, "minbytes": 1432, "maxbytes": 1432},
  "{profile}\\cert8.db": {"mincount": 0, "maxcount": 12, "minbytes": 0, "maxbytes": 65536},
  "{profile}\\key3.db": {"mincount": 0, "maxcount": 12, "minbytes": 0, "maxbytes": 32768},
- "{appdata}\\local\\temp": {"mincount": 0, "maxcount": 4, "minbytes": 0, "maxbytes": 278528}
+ "{appdata}\\local\\temp": {"mincount": 0, "maxcount": 4, "minbytes": 0, "maxbytes": 278528},
+ "{profile}\\favicons.sqlite": {"mincount": 8, "maxcount": 12, "minbytes": 196808, "maxbytes": 393216},
+ "{profile}\\favicons.sqlite-shm": {"mincount": 0, "maxcount": 4, "minbytes": 65536, "maxbytes": 131072},
+ "{profile}\\favicons.sqlite-wal": {"mincount": 0, "maxcount": 32, "minbytes": 0, "maxbytes": 131072},
 }
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -2552,16 +2552,17 @@ struct TrackedDBEntry
 static constexpr TrackedDBEntry kTrackedDBs[] = {
   // IndexedDB for about:home, see aboutHome.js
   TRACKEDDB_ENTRY("818200132aebmoouht.sqlite"),
   TRACKEDDB_ENTRY("addons.sqlite"),
   TRACKEDDB_ENTRY("content-prefs.sqlite"),
   TRACKEDDB_ENTRY("cookies.sqlite"),
   TRACKEDDB_ENTRY("downloads.sqlite"),
   TRACKEDDB_ENTRY("extensions.sqlite"),
+  TRACKEDDB_ENTRY("favicons.sqlite"),
   TRACKEDDB_ENTRY("formhistory.sqlite"),
   TRACKEDDB_ENTRY("index.sqlite"),
   TRACKEDDB_ENTRY("netpredictions.sqlite"),
   TRACKEDDB_ENTRY("permissions.sqlite"),
   TRACKEDDB_ENTRY("places.sqlite"),
   TRACKEDDB_ENTRY("reading-list.sqlite"),
   TRACKEDDB_ENTRY("search.sqlite"),
   TRACKEDDB_ENTRY("signons.sqlite"),