Suffixed histograms for SB2.DatabaseKilobytes and SB2.PrefixSetKilobytes

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 c0336cb2ee2ad91692d0da8fa252b702813aae90..7dd47a49edfcdbb16623ea2ad9d6c3f6bc712d9c 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -29659,6 +29659,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.DatabaseKilobytes.Browse.

[Scott Hess - ex-Googler, 2014/12/18 23:57:55]

Doesn't this imply some changes to SB2.DatabaseKilobyes?

[gab, 2014/12/19 15:25:54]

Yes, it is being suffixed in this CL, see <histogram_suffixes> additions at the
end of this file.

+  </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
     The size of the browsing SafeBrowsing database file on disk in kilobytes,
@@ -29823,6 +29826,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.DatabaseKilobytes.Download.
+  </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
     The size of the downloads SafeBrowsing database file on disk in kilobytes,
@@ -30341,7 +30347,7 @@ 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.DatabaseKilobytes.SideEffectFreeWhitelist.
   </obsolete>
   <owner>shess@chromium.org</owner>
   <summary>
@@ -30352,7 +30358,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>
@@ -61316,6 +61322,31 @@ 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="SafeBrowsingStores.IPBlacklists" separator=".">
+  <suffix name="IPBlacklist" label="IPBlacklist"/>
+  <affected-histogram name="SB2.DatabaseKilobytes"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="SafeBrowsingStores.PrefixSets" separator=".">
+  <suffix name="Browse" label="Browse"/>
+  <suffix name="SideEffectFreeWhitelist" label="SideEffectFreeWhitelist"/>
+  <suffix name="UnwantedSoftware" label="UnwantedSoftware"/>
+  <affected-histogram name="SB2.DatabaseKilobytes"/>
+  <affected-histogram name="SB2.PrefixSetKilobytes"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="SafeBrowsingStores.RawStores" separator=".">
+  <suffix name="Download" label="Download"/>
+  <suffix name="ExtensionBlacklist" label="ExtensionBlacklist"/>
+  <affected-histogram name="SB2.DatabaseKilobytes"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="SafeBrowsingStores.SBWhiteLists" separator=".">
+  <suffix name="CSD" label="CSD"/>
+  <suffix name="DownloadWhitelist" label="DownloadWhitelist"/>
+  <affected-histogram name="SB2.DatabaseKilobytes"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="SBInterstitial">
   <obsolete>
     deprecated November 10 2012 crrev.com/167056