ntp_tiles: Cleanup enum names

chrome/browser/android/ntp/most_visited_sites_bridge.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/ntp/most_visited_sites_bridge.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 13 matching lines @@
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ToJavaIntArray;
 using ntp_tiles::MostVisitedSites;
-using ntp_tiles::NTPTileSource;
+using ntp_tiles::TileSource;
 using ntp_tiles::NTPTilesVector;
-using ntp_tiles::metrics::MostVisitedTileType;
+using ntp_tiles::TileVisualType;
 using ntp_tiles::metrics::TileImpression;
 
 class MostVisitedSitesBridge::JavaObserver : public MostVisitedSites::Observer {
  public:
   JavaObserver(JNIEnv* env, const JavaParamRef<jobject>& obj);
 
   void OnMostVisitedURLsAvailable(const NTPTilesVector& tiles) override;
 
   void OnIconMadeAvailable(const GURL& site_url) override;
 
@@ skipping 85 matching lines @@
   base::android::JavaIntArrayToIntVector(env, jtile_types, &int_tile_types);
   std::vector<std::string> string_tile_urls;
   base::android::AppendJavaStringArrayToStringVector(env, jtile_urls,
                                                      &string_tile_urls);
 
   DCHECK_EQ(int_sources.size(), int_tile_types.size());
   DCHECK_EQ(int_sources.size(), string_tile_urls.size());
 
   std::vector<TileImpression> tiles;
   for (size_t i = 0; i < int_sources.size(); i++) {
-    NTPTileSource source = static_cast<NTPTileSource>(int_sources[i]);
-    MostVisitedTileType tile_type =
-        static_cast<MostVisitedTileType>(int_tile_types[i]);
+    TileSource source = static_cast<TileSource>(int_sources[i]);
+    TileVisualType tile_type = static_cast<TileVisualType>(int_tile_types[i]);
 
     tiles.emplace_back(source, tile_type, GURL(string_tile_urls[i]));
   }
   ntp_tiles::metrics::RecordPageImpression(tiles,
                                            g_browser_process->rappor_service());
 }
 
 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint index,
     jint tile_type,
     jint source) {
-  ntp_tiles::metrics::RecordTileClick(
-      index, static_cast<NTPTileSource>(source),
-      static_cast<MostVisitedTileType>(tile_type));
+  ntp_tiles::metrics::RecordTileClick(index, static_cast<TileSource>(source),
+                                      static_cast<TileVisualType>(tile_type));
 }
 
 // static
 bool MostVisitedSitesBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSitesBridge* most_visited_sites =
       new MostVisitedSitesBridge(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }