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 031da74bc35bf983f2d9169d832a63906dc56398..d7d36f60df38e92289c170c0f067035791bc0886 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -42374,7 +42374,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="NewTabPage.TileType" enum="MostVisitedTileType">
+<histogram name="NewTabPage.TileType" enum="NTPTileVisualType">
   <owner>newt@chromium.org</owner>
   <summary>
     The visual type of each most visited tile displayed on the new tab page,
@@ -42383,7 +42383,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="NewTabPage.TileTypeClicked" enum="MostVisitedTileType">
+<histogram name="NewTabPage.TileTypeClicked" enum="NTPTileVisualType">
   <owner>newt@chromium.org</owner>
   <summary>
     The visual type of the most visited item that the user clicked on, e.g.
@@ -102884,29 +102884,6 @@ from previous Chrome versions.
   <int value="11" label="11"/>
 </enum>
 
-<enum name="MostVisitedTileType" type="int">
-  <summary>The visual type of a most visited tile on the new tab page.</summary>
-  <int value="0" label="None">The icon or thumbnail hasn't loaded yet.</int>
-  <int value="1" label="IconReal">
-    The item displays a site's actual favicon or touch icon.
-  </int>
-  <int value="2" label="IconColor">
-    The item displays a color derived from the site's favicon or touch icon.
-  </int>
-  <int value="3" label="IconDefault">
-    The item displays a default gray box in place of an icon.
-  </int>
-  <int value="4" label="ThumbnailLocal">

[Marc Treib, 2017/04/03 14:03:25]

I know that we usually don't remove enum entries, but these have never been
recorded, and they don't exist in the C++ equivalent of this enum. I don't know
why they even exist.

[Ilya Sherman, 2017/04/03 21:34:55]

Are you sure they have never been recorded?  Unless you can track down exactly
when these were added and confirm that they're never been used, I'd prefer to
play it safe and keep the entries, perhaps marking them as " (deprecated)" in
the labels.

[Marc Treib, 2017/04/04 08:09:21]

Good call! Turns out I was wrong, and they were actually recorded
(https://codereview.chromium.org/1373983003).
I've marked them deprecated, and also added them (commented-out) on the C++
side.

-    The item displays a locally-captured thumbnail of the site content.
-  </int>
-  <int value="5" label="ThumbnailServer">
-    The item displays a server-provided thumbnail of the site content.
-  </int>
-  <int value="6" label="ThumbnailDefault">
-    The item displays a default graphic in place of a thumbnail.
-  </int>
-</enum>
-
 <enum name="MotionEventToolType" type="int">
   <summary>The type of tool that triggers a pointer-type MotionEvent.</summary>
   <int value="0" label="Unknown">Unknown tool type.</int>
@@ -104342,6 +104319,20 @@ from previous Chrome versions.
   <int value="3" label="Too few URLs, didn't flip tiles 1 and 4"/>
 </enum>
 
+<enum name="NTPTileVisualType" type="int">
+  <summary>The visual type of a most visited tile on the new tab page.</summary>
+  <int value="0" label="None">The icon or thumbnail hasn't loaded yet.</int>
+  <int value="1" label="IconReal">
+    The item displays a site's actual favicon or touch icon.
+  </int>
+  <int value="2" label="IconColor">
+    The item displays a color derived from the site's favicon or touch icon.
+  </int>
+  <int value="3" label="IconDefault">
+    The item displays a default gray box in place of an icon.
+  </int>
+</enum>
+
 <enum name="NTSTATUS" type="int">
   <int value="-1073741818" label="0xC0000006 - STATUS_IN_PAGE_ERROR"/>
   <int value="-1073741808" label="0xC0000010 - STATUS_INVALID_DEVICE_REQUEST"/>