tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index ad1c97e849aab094a9cbbe53e8ee76f44ae8be25..1e2e841578e8e8d631698b621dd4022ffb43c62a 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -29792,6 +29792,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="SB2.BrowseDatabaseKilobytes" units="KB">
+  <obsolete>
+    Deprecated 12/2014. Moved to SB2.DatabaseSizeKilobytes.Browse.
+  </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
     The size of the browsing SafeBrowsing database file on disk in kilobytes,
@@ -29898,10 +29901,12 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="SB2.DatabaseKilobytes" units="KB">
-  <owner>gab@chromium.org</owner>
+  <obsolete>
+    Replaced by SB2.BrowseDatabaseKilobytes.
+  </obsolete>
+  <owner>shess@chromium.org</owner>
   <summary>
-    The size of one of the browsing SafeBrowsing database file on disk in
-    kilobytes, after an update has occurred.
+    The size of the SafeBrowsing database file on disk in kilobytes.
   </summary>
 </histogram>
 
@@ -29913,6 +29918,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="SB2.DatabaseSizeKilobytes" units="KB">
+  <owner>gab@chromium.org</owner>
+  <summary>
+    The size of one of the SafeBrowsing database file on disk in kilobytes,
+    after a database update has occurred (once on startup (delayed) and
+    periodically thereafter).
+  </summary>
+</histogram>
+
 <histogram name="SB2.DatabaseUpdateKilobytes" units="KB">
   <owner>shess@chromium.org</owner>
   <summary>
@@ -29956,6 +29970,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="SB2.DownloadDatabaseKilobytes" units="KB">
+  <obsolete>
+    Deprecated 12/2014. Moved to SB2.DatabaseSizeKilobytes.Download.
+  </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
     The size of the downloads SafeBrowsing database file on disk in kilobytes,
@@ -30474,7 +30491,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 
 <histogram name="SB2.SideEffectFreeWhitelistDatabaseKilobytes" units="KB">
   <obsolete>
-    Deprecated 12/2014. Merged into SB2.DatabaseKilobytes.
+    Deprecated 12/2014. Moved to
+    SB2.DatabaseSizeKilobytes.SideEffectFreeWhitelist.
   </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
@@ -30485,7 +30503,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 
 <histogram name="SB2.SideEffectFreeWhitelistPrefixSetKilobytes" units="KB">
   <obsolete>
-    Deprecated 12/2014. Merged into SB2.PrefixSetKilobytes.
+    Deprecated 12/2014. Moved to SB2.PrefixSetKilobytes.SideEffectFreeWhitelist.
   </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
@@ -61777,6 +61795,19 @@ To add a new entry, add it with any value and run test to compute valid value.
       name="ResourcePrefetchPredictor.Url.PredictedPrefetchMisses"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="SafeBrowsingLists" separator=".">
+  <suffix name="Browse" label="Browse"/>
+  <suffix name="Download" label="Download"/>
+  <suffix name="CsdWhitelist" label="CsdWhitelist"/>
+  <suffix name="DownloadWhitelist" label="DownloadWhitelist"/>
+  <suffix name="ExtensionBlacklist" label="ExtensionBlacklist"/>
+  <suffix name="SideEffectFreeWhitelist" label="SideEffectFreeWhitelist"/>
+  <suffix name="IPBlacklist" label="IPBlacklist"/>
+  <suffix name="UnwantedSoftware" label="UnwantedSoftware"/>
+  <affected-histogram name="SB2.DatabaseSizeKilobytes"/>
+  <affected-histogram name="SB2.PrefixSetKilobytes"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="SBInterstitial">
   <obsolete>
     deprecated November 10 2012 crrev.com/167056