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 1e2d3174ff61237a3c948590d5827c2b9df0e172..6f8845b046f878632370143b91d9afade77d3d63 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -11285,6 +11285,21 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="History.FaviconDatabaseAdvancedMetricsTime" units="ticks">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    The wall-clock time taken to gather favicon database metrics.

[jwd, 2015/03/31 15:09:41]

Can you add a description of when these get logged.

[Roger McFarlane (Chromium), 2015/03/31 15:35:09]

Done.

+  </summary>
+</histogram>
+
+<histogram name="History.FaviconDatabaseSizeMB" units="MB">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    Size of the Favicons database in MB. This is calculated as the number of
+    pages consumed by the database multiplied by the page size.
+  </summary>
+</histogram>
+
 <histogram name="History.FaviconsRecoveredPercentage" units="%">
   <owner>rpop@google.com</owner>
   <summary>
@@ -11322,6 +11337,52 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="History.NumFaviconBitmapsInDB">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    The total number of favicon bitmaps (of all sizes) cached in a user's
+    Favicon database. A given favicon URL may be associated with multiple
+    bitmaps (of different sizes).
+  </summary>
+</histogram>
+
+<histogram name="History.NumFaviconMappingsInDB">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    The number of page URL (e.g., http://www.google.com) to favicon URL (e.g.,
+    http://www.google.com/favicon.ico) mappings stored in a user's Favicon
+    database.
+  </summary>
+</histogram>
+
+<histogram name="History.NumFaviconsInDB">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    The total number of favicon URLs (e.g. http://www.google.com/favicon.ico)
+    tracked in a user's Favicon database. This metric tracks knowledge of a
+    favicon URL not whether there are cached bitmaps for that favicon URL. See
+    History.NumFaviconBitmapsInDB for that.
+  </summary>
+</histogram>
+
+<histogram name="History.NumLargeFaviconBitmapsInDB">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    The total number of large (&gt;= 64 pixels wide) favicons being tracked in a
+    user's Favicon database. This is a subset of History.NumFaviconBitmapsInDB,
+    which includes all sizes in its count.
+  </summary>
+</histogram>
+
+<histogram name="History.NumTouchIconsInDB">
+  <owner>rogerm@google.com</owner>
+  <summary>
+    The total number of touch icons being tracked in a user's Favicon database.
+    This is a subset of History.NumFaviconsInDB, which includes all icon types
+    in its count.
+  </summary>
+</histogram>
+
 <histogram name="History.TopSitesRecoveredPercentage" units="%">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>