Cleanup: Change LogMostVisitedImpression|Navigation APIs to take an enum

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 "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
@@ skipping 40 matching lines @@
 
 // Name of the histogram keeping track of suggestion navigations.
 const char kMostVisitedNavigationHistogramName[] =
     "NewTabPage.MostVisited";
 
 // Format string to generate the name for the histogram keeping track of
 // suggestion navigations.
 const char kMostVisitedNavigationHistogramWithProvider[] =
     "NewTabPage.MostVisited.%s";
 
+std::string GetSourceName(NTPLoggingTileSource tile_source) {
+  switch (tile_source) {
+    case NTPLoggingTileSource::CLIENT:
+      return "client";
+    case NTPLoggingTileSource::SERVER:
+      return "server";
+  }
+  NOTREACHED();
+  return std::string();
+}
+
 }  // 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 129 matching lines @@
       // is a good proxy for the total load time of the NTP, therefore we keep
       // the max as the load time.
       load_time_ = std::max(load_time_, time);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void NTPUserDataLogger::LogMostVisitedImpression(
-    int position, const base::string16& provider) {
-  // Log the Most Visited navigation for navigations that have providers and
-  // those that dont.
+    int position, NTPLoggingTileSource tile_source) {
   UMA_HISTOGRAM_ENUMERATION(kMostVisitedImpressionHistogramName, position,
                             kNumMostVisited);
 
-  // If a provider is specified, log the metric specific to it.
-  if (!provider.empty()) {
-    // Cannot rely on UMA histograms macro because the name of the histogram is
-    // generated dynamically.
-    base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
-        base::StringPrintf(kMostVisitedImpressionHistogramWithProvider,
-                           base::UTF16ToUTF8(provider).c_str()),
-        1,
-        kNumMostVisited,
-        kNumMostVisited + 1,
-        base::Histogram::kUmaTargetedHistogramFlag);
-    counter->Add(position);
-  }
+  // Cannot rely on UMA histograms macro because the name of the histogram is
+  // generated dynamically.
+  base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
+      base::StringPrintf(kMostVisitedImpressionHistogramWithProvider,
+                         GetSourceName(tile_source).c_str()),
+      1,
+      kNumMostVisited,
+      kNumMostVisited + 1,
+      base::Histogram::kUmaTargetedHistogramFlag);
+  counter->Add(position);
 }
 
 void NTPUserDataLogger::LogMostVisitedNavigation(
-    int position, const base::string16& provider) {
-  // Log the Most Visited navigation for navigations that have providers and
-  // those that dont.
+    int position, NTPLoggingTileSource tile_source) {
   UMA_HISTOGRAM_ENUMERATION(kMostVisitedNavigationHistogramName, position,
                             kNumMostVisited);
 
-  // If a provider is specified, log the metric specific to it.
-  if (!provider.empty()) {
-    // Cannot rely on UMA histograms macro because the name of the histogram is
-    // generated dynamically.
-    base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
-        base::StringPrintf(kMostVisitedNavigationHistogramWithProvider,
-                           base::UTF16ToUTF8(provider).c_str()),
-        1,
-        kNumMostVisited,
-        kNumMostVisited + 1,
-        base::Histogram::kUmaTargetedHistogramFlag);
-    counter->Add(position);
-  }
+  // Cannot rely on UMA histograms macro because the name of the histogram is
+  // generated dynamically.
+  base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
+      base::StringPrintf(kMostVisitedNavigationHistogramWithProvider,
+                         GetSourceName(tile_source).c_str()),
+      1,
+      kNumMostVisited,
+      kNumMostVisited + 1,
+      base::Histogram::kUmaTargetedHistogramFlag);
+  counter->Add(position);
 
   // 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"));
 }
 
 // content::WebContentsObserver override
 void NTPUserDataLogger::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   if (!load_details.previous_url.is_valid())
@@ skipping 31 matching lines @@
       browser_sync::SessionsSyncManager* sessions =
           static_cast<browser_sync::SessionsSyncManager*>(
               sync->GetSessionsSyncableService());
       if (sessions) {
         sync_sessions::SyncSessionsMetrics::RecordYoungestForeignTabAgeOnNTP(
             sessions);
       }
     }
   }
 }