[Android NTP] Use UMA histograms instead of local ones.

chrome/browser/android/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 "chrome/browser/android/most_visited_sites.h"
 
 #include <string>
 #include <vector>
 
 #include "base/android/jni_android.h"
@@ skipping 260 matching lines @@
       break;
     }
   }
 }
 
 void MostVisitedSites::RecordOpenedMostVisitedItem(JNIEnv* env,
                                                    jobject obj,
                                                    jint index) {
   switch (mv_source_) {
     case TOP_SITES: {
-      HISTOGRAM_SPARSE_SLOWLY(kOpenedItemClientHistogramName, index);
+      UMA_HISTOGRAM_SPARSE_SLOWLY(kOpenedItemClientHistogramName, index);
       break;
     }
     case SUGGESTIONS_SERVICE: {
       if (server_suggestions_.suggestions_size() > index) {
         if (server_suggestions_.suggestions(index).providers_size()) {
           std::string histogram = base::StringPrintf(
               kOpenedItemServerProviderHistogramFormat,
               server_suggestions_.suggestions(index).providers(0));
           LogHistogramEvent(histogram, index, num_sites_);
         } else {
-          HISTOGRAM_SPARSE_SLOWLY(kOpenedItemServerHistogramName, index);
+          UMA_HISTOGRAM_SPARSE_SLOWLY(kOpenedItemServerHistogramName, index);
         }
       }
       break;
     }
   }
 }
 
 void MostVisitedSites::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
@@ skipping 43 matching lines @@
     ScopedJavaGlobalRef<jobject>* j_observer,
     int num_sites,
     const history::MostVisitedURLList& visited_list) {
   std::vector<base::string16> titles;
   std::vector<std::string> urls;
   ExtractMostVisitedTitlesAndURLs(visited_list, &titles, &urls, num_sites);
 
   mv_source_ = TOP_SITES;
 
   int num_tiles = urls.size();
-  HISTOGRAM_SPARSE_SLOWLY(kNumTilesHistogramName, num_tiles);
+  UMA_HISTOGRAM_SPARSE_SLOWLY(kNumTilesHistogramName, num_tiles);
   for (int i = 0; i < num_tiles; ++i) {
-    HISTOGRAM_SPARSE_SLOWLY(kImpressionClientHistogramName, i);
+    UMA_HISTOGRAM_SPARSE_SLOWLY(kImpressionClientHistogramName, i);
   }
 
   JNIEnv* env = AttachCurrentThread();
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env,
       j_observer->obj(),
       ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj());
 }
 
@@ skipping 13 matching lines @@
   int i = 0;
   for (; i < size && i < num_sites_; ++i) {
     const ChromeSuggestion& suggestion = suggestions_profile.suggestions(i);
     titles.push_back(base::UTF8ToUTF16(suggestion.title()));
     urls.push_back(suggestion.url());
     if (suggestion.providers_size()) {
       std::string histogram = base::StringPrintf(
           kImpressionServerHistogramFormat, suggestion.providers(0));
       LogHistogramEvent(histogram, i, num_sites_);
     } else {
-      HISTOGRAM_SPARSE_SLOWLY(kImpressionServerHistogramName, i);
+      UMA_HISTOGRAM_SPARSE_SLOWLY(kImpressionServerHistogramName, i);
     }
   }
-  HISTOGRAM_SPARSE_SLOWLY(kNumTilesHistogramName, i);
+  UMA_HISTOGRAM_SPARSE_SLOWLY(kNumTilesHistogramName, i);
 
   mv_source_ = SUGGESTIONS_SERVICE;
   // Keep a copy of the suggestions for eventual logging.
   server_suggestions_ = suggestions_profile;
 
   JNIEnv* env = AttachCurrentThread();
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env,
       j_observer->obj(),
       ToJavaArrayOfStrings(env, titles).obj(),
@@ skipping 41 matching lines @@
         gfx::ConvertToJavaBitmap(bitmap).obj());
   } else {
     num_empty_thumbs_++;
   }
 
   Java_ThumbnailCallback_onMostVisitedURLsThumbnailAvailable(
       env, j_callback->obj(), j_bitmap_ref->obj());
 }
 
 void MostVisitedSites::RecordUMAMetrics() {
-  HISTOGRAM_SPARSE_SLOWLY(kNumLocalThumbnailTilesHistogramName,
-                          num_local_thumbs_);
+  UMA_HISTOGRAM_SPARSE_SLOWLY(kNumLocalThumbnailTilesHistogramName,
+                              num_local_thumbs_);
   num_local_thumbs_ = 0;
-  HISTOGRAM_SPARSE_SLOWLY(kNumEmptyTilesHistogramName, num_empty_thumbs_);
+  UMA_HISTOGRAM_SPARSE_SLOWLY(kNumEmptyTilesHistogramName, num_empty_thumbs_);
   num_empty_thumbs_ = 0;
-  HISTOGRAM_SPARSE_SLOWLY(kNumServerTilesHistogramName, num_server_thumbs_);
+  UMA_HISTOGRAM_SPARSE_SLOWLY(kNumServerTilesHistogramName, num_server_thumbs_);
   num_server_thumbs_ = 0;
 }
 
 static jlong Init(JNIEnv* env, jobject obj, jobject jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }