NTP: Fix metrics recording crash by plumbing the necessary data to Java.

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 <utility>
 
@@ skipping 31 matching lines @@
 const char kHistogramServerName[] = "server";
 const char kHistogramServerFormat[] = "server%d";
 const char kHistogramPopularName[] = "popular";
 const char kHistogramWhitelistName[] = "whitelist";
 
 const char kPopularSitesFieldTrialName[] = "NTPPopularSites";
 
 const base::Feature kDisplaySuggestionsServiceTiles{
     "DisplaySuggestionsServiceTiles", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// 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,
-    NUM_TILE_TYPES,
-};
-
 // Log an event for a given |histogram| at a given element |position|. This
 // routine exists because regular histogram macros are cached thus can't be used
 // if the name of the histogram will change at a given call site.
 void LogHistogramEvent(const std::string& histogram,
                        int position,
                        int num_sites) {
   base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
       histogram,
       1,
       num_sites,
@@ skipping 173 matching lines @@
 
   // Only blacklist in the server-side suggestions service if it's active.
   if (mv_source_ == SUGGESTIONS_SERVICE) {
     if (add_url)
       suggestions_service_->BlacklistURL(url);
     else
       suggestions_service_->UndoBlacklistURL(url);
   }
 }
 
-void MostVisitedSites::RecordTileTypeMetrics(
-    const std::vector<int>& tile_types) {
-  DCHECK_EQ(current_suggestions_.size(), tile_types.size());
-  int counts_per_type[NUM_TILE_TYPES] = {0};
-  for (size_t i = 0; i < tile_types.size(); ++i) {
-    int tile_type = tile_types[i];
-    ++counts_per_type[tile_type];
-    std::string histogram = base::StringPrintf(
-        "NewTabPage.TileType.%s",
-        GetSourceHistogramName(current_suggestions_[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) {
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(current_suggestions_.size()));
   std::string histogram = base::StringPrintf(
       "NewTabPage.MostVisited.%s",
       GetSourceHistogramName(current_suggestions_[index]).c_str());
   LogHistogramEvent(histogram, index, num_sites_);
 
   histogram = base::StringPrintf(
       "NewTabPage.TileTypeClicked.%s",
@@ skipping 279 matching lines @@
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == TOP_SITES) {
     // The displayed suggestions are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles