Use NTPTileSource in MVS interface.

components/ntp_tiles/most_visited_sites.cc

 // Copyright 2013 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/most_visited_sites.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 105 matching lines @@
   }
   // The whole grid is already filled with personal tiles, no point in bothering
   // with popular ones.
   return false;
 }
 
 bool AreURLsEquivalent(const GURL& url1, const GURL& url2) {
   return url1.host() == url2.host() && url1.path() == url2.path();
 }
 
-std::string GetSourceHistogramName(int source) {
+std::string GetSourceHistogramName(NTPTileSource source) {
   switch (source) {
-    case static_cast<int>(NTPTileSource::TOP_SITES):
+    case NTPTileSource::TOP_SITES:
       return kHistogramClientName;
-    case static_cast<int>(NTPTileSource::POPULAR):
+    case NTPTileSource::POPULAR:
       return kHistogramPopularName;
-    case static_cast<int>(NTPTileSource::WHITELIST):
+    case NTPTileSource::WHITELIST:
       return kHistogramWhitelistName;
-    case static_cast<int>(NTPTileSource::SUGGESTIONS_SERVICE):
+    case NTPTileSource::SUGGESTIONS_SERVICE:
       return kHistogramServerName;
   }
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace
 
 MostVisitedSites::MostVisitedSites(PrefService* prefs,
                                    scoped_refptr<history::TopSites> top_sites,
@@ skipping 74 matching lines @@
   // Only blacklist in the server-side suggestions service if it's active.
   if (mv_source_ == NTPTileSource::SUGGESTIONS_SERVICE) {
     if (add_url)
       suggestions_service_->BlacklistURL(url);
     else
       suggestions_service_->UndoBlacklistURL(url);
   }
 }
 
 void MostVisitedSites::RecordTileTypeMetrics(
-    const std::vector<int>& tile_types,
-    const std::vector<int>& sources) {
+    const std::vector<MostVisitedTileType>& tile_types,
+    const std::vector<NTPTileSource>& sources) {
   int counts_per_type[NUM_TILE_TYPES] = {0};
   for (size_t i = 0; i < tile_types.size(); ++i) {
-    int tile_type = tile_types[i];
+    MostVisitedTileType tile_type = tile_types[i];
     ++counts_per_type[tile_type];
 
     UMA_HISTOGRAM_ENUMERATION("NewTabPage.TileType", tile_type, NUM_TILE_TYPES);
 
     std::string histogram = base::StringPrintf(
         "NewTabPage.TileType.%s",
         GetSourceHistogramName(sources[i]).c_str());
     LogHistogramEvent(histogram, tile_type, NUM_TILE_TYPES);
   }
 
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.IconsReal",
                               counts_per_type[ICON_REAL]);
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.IconsColor",
                               counts_per_type[ICON_COLOR]);
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.IconsGray",
                               counts_per_type[ICON_DEFAULT]);
 }
 
-void MostVisitedSites::RecordOpenedMostVisitedItem(int index,
-                                                   int tile_type,
-                                                   int source) {
+void MostVisitedSites::RecordOpenedMostVisitedItem(
+    int index,
+    MostVisitedTileType tile_type,
+    NTPTileSource source) {
   UMA_HISTOGRAM_ENUMERATION("NewTabPage.MostVisited", index, num_sites_);
 
   std::string histogram = base::StringPrintf(
       "NewTabPage.MostVisited.%s", GetSourceHistogramName(source).c_str());
   LogHistogramEvent(histogram, index, num_sites_);
 
   UMA_HISTOGRAM_ENUMERATION(
       "NewTabPage.TileTypeClicked", tile_type, NUM_TILE_TYPES);
 
   histogram = base::StringPrintf("NewTabPage.TileTypeClicked.%s",
@@ skipping 262 matching lines @@
 void MostVisitedSites::RecordImpressionUMAMetrics() {
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles",
                               current_tiles_.size());
 
   for (size_t i = 0; i < current_tiles_.size(); i++) {
     UMA_HISTOGRAM_ENUMERATION(
         "NewTabPage.SuggestionsImpression", static_cast<int>(i), num_sites_);
 
     std::string histogram = base::StringPrintf(
         "NewTabPage.SuggestionsImpression.%s",
-        GetSourceHistogramName(static_cast<int>(current_tiles_[i].source))
-            .c_str());
+        GetSourceHistogramName(current_tiles_[i].source).c_str());
     LogHistogramEvent(histogram, static_cast<int>(i), num_sites_);
   }
 }
 
 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {}
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == NTPTileSource::TOP_SITES) {
     // The displayed tiles are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles