ntp_tiles: Cleanup enum names

components/ntp_tiles/metrics.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_tiles/metrics.h"
 
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 26 matching lines @@
 void LogHistogramEvent(const std::string& histogram,
                        int position,
                        int num_sites) {
   base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
       histogram, 1, num_sites, num_sites + 1,
       base::Histogram::kUmaTargetedHistogramFlag);
   if (counter)
     counter->Add(position);
 }
 
-std::string GetSourceHistogramName(NTPTileSource source) {
+std::string GetSourceHistogramName(TileSource source) {
   switch (source) {
-    case NTPTileSource::TOP_SITES:
+    case TileSource::TOP_SITES:
       return kHistogramClientName;
-    case NTPTileSource::POPULAR:
+    case TileSource::POPULAR:
       return kHistogramPopularName;
-    case NTPTileSource::WHITELIST:
+    case TileSource::WHITELIST:
       return kHistogramWhitelistName;
-    case NTPTileSource::SUGGESTIONS_SERVICE:
+    case TileSource::SUGGESTIONS_SERVICE:
       return kHistogramServerName;
   }
   NOTREACHED();
   return std::string();
 }
 
-const char* GetIconTypeSuffix(MostVisitedTileType type) {
+const char* GetIconTypeSuffix(TileVisualType type) {
   switch (type) {
-    case ICON_COLOR:
+    case TileVisualType::ICON_COLOR:
       return kIconTypeSuffixColor;
-    case ICON_DEFAULT:
+    case TileVisualType::ICON_DEFAULT:
       return kIconTypeSuffixGray;
-    case ICON_REAL:
+    case TileVisualType::ICON_REAL:
       return kIconTypeSuffixReal;
-    case NONE:                     // Fall through.
-    case NUM_RECORDED_TILE_TYPES:  // Fall through.
-    case THUMBNAIL:                // Fall through.
-    case UNKNOWN_TILE_TYPE:
+    case TileVisualType::NONE:                     // Fall through.
+    case TileVisualType::NUM_RECORDED_TILE_TYPES:  // Fall through.
+    case TileVisualType::THUMBNAIL:                // Fall through.
+    case TileVisualType::UNKNOWN_TILE_TYPE:
       break;
   }
   return nullptr;
 }
 
 }  // namespace
 
 void RecordPageImpression(const std::vector<TileImpression>& tiles,
                           rappor::RapporService* rappor_service) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles", tiles.size());
 
   for (int index = 0; index < static_cast<int>(tiles.size()); index++) {
-    NTPTileSource source = tiles[index].source;
-    MostVisitedTileType tile_type = tiles[index].type;
+    TileSource source = tiles[index].source;
+    TileVisualType tile_type = tiles[index].type;
     const GURL& url = tiles[index].url;
 
     UMA_HISTOGRAM_ENUMERATION("NewTabPage.SuggestionsImpression", index,
                               kMaxNumTiles);
 
     std::string source_name = GetSourceHistogramName(source);
     std::string impression_histogram = base::StringPrintf(
         "NewTabPage.SuggestionsImpression.%s", source_name.c_str());
     LogHistogramEvent(impression_histogram, index, kMaxNumTiles);
 
@@ skipping 15 matching lines @@
           base::StringPrintf("NTP.SuggestionsImpressions.%s", icon_type_suffix),
           url);
 
       std::string icon_impression_histogram = base::StringPrintf(
           "NewTabPage.SuggestionsImpression.%s", icon_type_suffix);
       LogHistogramEvent(icon_impression_histogram, index, kMaxNumTiles);
     }
   }
 }
 
-void RecordTileClick(int index,
-                     NTPTileSource source,
-                     MostVisitedTileType tile_type) {
+void RecordTileClick(int index, TileSource source, TileVisualType tile_type) {
   UMA_HISTOGRAM_ENUMERATION("NewTabPage.MostVisited", index, kMaxNumTiles);
 
   std::string histogram = base::StringPrintf(
       "NewTabPage.MostVisited.%s", GetSourceHistogramName(source).c_str());
   LogHistogramEvent(histogram, index, kMaxNumTiles);
 
   const char* icon_type_suffix = GetIconTypeSuffix(tile_type);
   if (icon_type_suffix) {
     std::string icon_histogram =
         base::StringPrintf("NewTabPage.MostVisited.%s", icon_type_suffix);
     LogHistogramEvent(icon_histogram, index, kMaxNumTiles);
   }
 
   if (tile_type < NUM_RECORDED_TILE_TYPES) {
     UMA_HISTOGRAM_ENUMERATION("NewTabPage.TileTypeClicked", tile_type,
                               NUM_RECORDED_TILE_TYPES);
 
     std::string histogram =
         base::StringPrintf("NewTabPage.TileTypeClicked.%s",
                            GetSourceHistogramName(source).c_str());
     LogHistogramEvent(histogram, tile_type, NUM_RECORDED_TILE_TYPES);
   }
 }
 
 }  // namespace metrics
 }  // namespace ntp_tiles