ntp_tiles: Cleanup enum names

components/ntp_tiles/metrics.h

Index: components/ntp_tiles/metrics.h
diff --git a/components/ntp_tiles/metrics.h b/components/ntp_tiles/metrics.h
index 009c4942b8be62d4b58e6d3aff742e6ad66a26f2..187d71960d9aaa4f9abc493972e347df047c69e3 100644
--- a/components/ntp_tiles/metrics.h
+++ b/components/ntp_tiles/metrics.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "components/ntp_tiles/ntp_tile.h"
+#include "components/ntp_tiles/tile_visual_type.h"
 #include "url/gurl.h"
 
 namespace rappor {
@@ -18,40 +19,12 @@ class RapporService;
 namespace ntp_tiles {
 namespace metrics {
 
-// The visual type of a most visited tile.
-//
-// These values must stay in sync with the MostVisitedTileType enum
-// in histograms.xml.
-//
-// A Java counterpart will be generated for this enum.
-// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.ntp
-enum MostVisitedTileType {
-  // The icon or thumbnail hasn't loaded yet.
-  NONE,
-  // The item displays a site's actual favicon or touch icon.
-  ICON_REAL,
-  // The item displays a color derived from the site's favicon or touch icon.
-  ICON_COLOR,
-  // The item displays a default gray box in place of an icon.
-  ICON_DEFAULT,
-  // The number of different tile types that get recorded. Entries below this
-  // are not recorded in UMA.
-  NUM_RECORDED_TILE_TYPES,
-  // The item displays a thumbnail of the page. Used on desktop.
-  THUMBNAIL,
-  // The tile type has not been determined yet. Used on iOS, until we can detect
-  // when all tiles have loaded.
-  UNKNOWN_TILE_TYPE,
-};
-
 struct TileImpression {
-  TileImpression(NTPTileSource source,
-                 MostVisitedTileType type,
-                 const GURL& url)
+  TileImpression(TileSource source, TileVisualType type, const GURL& url)
       : source(source), type(type), url(url) {}
 
-  NTPTileSource source;
-  MostVisitedTileType type;
+  TileSource source;
+  TileVisualType type;
   GURL url;
 };
 
@@ -62,9 +35,7 @@ void RecordPageImpression(const std::vector<TileImpression>& tiles,
                           rappor::RapporService* rappor_service);
 
 // Records a click on a tile.
-void RecordTileClick(int index,
-                     NTPTileSource source,
-                     MostVisitedTileType tile_type);
+void RecordTileClick(int index, TileSource source, TileVisualType tile_type);
 
 }  // namespace metrics
 }  // namespace ntp_tiles