Cleanup: Replace NTPLoggingTileSource by ntp_tiles::NTPTileSource

chrome/browser/ui/webui/ntp/ntp_user_data_logger.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 "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 22 matching lines @@
           Profile::FromBrowserContext(contents->GetBrowserContext()));
   if (!sync)
     return;
   sync_sessions::SessionsSyncManager* sessions =
       static_cast<sync_sessions::SessionsSyncManager*>(
           sync->GetSessionsSyncableService());
   sync_sessions::SyncSessionsMetrics::RecordYoungestForeignTabAgeOnNTP(
       sessions);
 }
 
-ntp_tiles::NTPTileSource ConvertTileSource(NTPLoggingTileSource tile_source) {
-  switch (tile_source) {
-    case NTPLoggingTileSource::CLIENT:
-      return ntp_tiles::NTPTileSource::TOP_SITES;
-    case NTPLoggingTileSource::SERVER:
-      return ntp_tiles::NTPTileSource::SUGGESTIONS_SERVICE;
-  }
-  NOTREACHED();
-  return ntp_tiles::NTPTileSource::TOP_SITES;
-}
-
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(NTPUserDataLogger);
 
 
 // Log a time event for a given |histogram| at a given |value|. 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 LogLoadTimeHistogram(const std::string& histogram, base::TimeDelta value) {
   base::HistogramBase* counter = base::Histogram::FactoryTimeGet(
@@ skipping 38 matching lines @@
   return logger;
 }
 
 void NTPUserDataLogger::LogEvent(NTPLoggingEventType event,
                                  base::TimeDelta time) {
   DCHECK_EQ(NTP_ALL_TILES_LOADED, event);
   EmitNtpStatistics(time);
 }
 
 void NTPUserDataLogger::LogMostVisitedImpression(
-    int position, NTPLoggingTileSource tile_source) {
+    int position,
+    ntp_tiles::NTPTileSource tile_source) {
   if ((position >= kNumMostVisited) || impression_was_logged_[position]) {
     return;
   }
   impression_was_logged_[position] = true;
   impression_tile_source_[position] = tile_source;
 }
 
 void NTPUserDataLogger::LogMostVisitedNavigation(
-    int position, NTPLoggingTileSource tile_source) {
-  ntp_tiles::metrics::RecordTileClick(position, ConvertTileSource(tile_source),
+    int position,
+    ntp_tiles::NTPTileSource tile_source) {
+  ntp_tiles::metrics::RecordTileClick(position, tile_source,
                                       ntp_tiles::metrics::THUMBNAIL);
 
   // Records the action. This will be available as a time-stamped stream
   // server-side and can be used to compute time-to-long-dwell.
   content::RecordAction(base::UserMetricsAction("MostVisited_Clicked"));
 }
 
 NTPUserDataLogger::NTPUserDataLogger(content::WebContents* contents)
     : content::WebContentsObserver(contents),
       impression_tile_source_(kNumMostVisited),
@@ skipping 32 matching lines @@
            << "number of tiles: " << impression_was_logged_.count();
 
   std::vector<std::pair<ntp_tiles::NTPTileSource,
                         ntp_tiles::metrics::MostVisitedTileType>>
       tiles;
   bool has_server_side_suggestions = false;
   for (int i = 0; i < kNumMostVisited; i++) {
     if (!impression_was_logged_[i]) {
       break;
     }
-    if (impression_tile_source_[i] == NTPLoggingTileSource::SERVER) {
+    if (impression_tile_source_[i] ==
+        ntp_tiles::NTPTileSource::SUGGESTIONS_SERVICE) {
       has_server_side_suggestions = true;
     }
-    tiles.emplace_back(ConvertTileSource(impression_tile_source_[i]),
+    tiles.emplace_back(impression_tile_source_[i],
                        ntp_tiles::metrics::THUMBNAIL);
   }
   ntp_tiles::metrics::RecordPageImpression(tiles);
 
   LogLoadTimeHistogram("NewTabPage.LoadTime", load_time);
 
   // Split between ML and MV.
   std::string type = has_server_side_suggestions ? "MostLikely" : "MostVisited";
   LogLoadTimeHistogram("NewTabPage.LoadTime." + type, load_time);
 
   // Split between Web and Local.
   std::string variant = ntp_url_.SchemeIsHTTPOrHTTPS() ? "Web" : "LocalNTP";
   LogLoadTimeHistogram("NewTabPage.LoadTime." + variant, load_time);
 
   // Split between Startup and non-startup.
   std::string status = during_startup_ ? "Startup" : "NewTab";
   LogLoadTimeHistogram("NewTabPage.LoadTime." + status, load_time);
 
   has_emitted_ = true;
   during_startup_ = false;
 }