Use NTPTileSource in MVS interface.

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 24 matching lines @@
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ToJavaIntArray;
 using content::BrowserThread;
 using ntp_tiles::MostVisitedSites;
 using ntp_tiles::MostVisitedSitesSupervisor;
+using ntp_tiles::NTPTileSource;
 using suggestions::SuggestionsServiceFactory;
 
 MostVisitedSitesBridge::SupervisorBridge::SupervisorBridge(Profile* profile)
     : profile_(profile),
       supervisor_observer_(nullptr),
       register_observer_(this) {
   register_observer_.Add(SupervisedUserServiceFactory::GetForProfile(profile_));
 }
 
 MostVisitedSitesBridge::SupervisorBridge::~SupervisorBridge() {}
@@ skipping 143 matching lines @@
     jboolean add_url) {
   GURL url(ConvertJavaStringToUTF8(env, j_url));
   most_visited_.AddOrRemoveBlacklistedUrl(url, add_url);
 }
 
 void MostVisitedSitesBridge::RecordTileTypeMetrics(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jintArray>& jtile_types,
     const JavaParamRef<jintArray>& jsources) {
-  std::vector<int> tile_types;
-  std::vector<int> sources;
+  std::vector<int> int_tile_types;
+  base::android::JavaIntArrayToIntVector(env, jtile_types, &int_tile_types);
+  std::vector<MostVisitedSites::MostVisitedTileType> tile_types;
+  for (int source : int_tile_types) {
+    tile_types.push_back(
+        static_cast<MostVisitedSites::MostVisitedTileType>(source));
+  }
 
-  base::android::JavaIntArrayToIntVector(env, jtile_types, &tile_types);
-  base::android::JavaIntArrayToIntVector(env, jsources, &sources);
+  std::vector<int> int_sources;
+  base::android::JavaIntArrayToIntVector(env, jsources, &int_sources);
+  std::vector<NTPTileSource> sources;
+  for (int source : int_sources) {
+    sources.push_back(static_cast<NTPTileSource>(source));
+  }
 
   most_visited_.RecordTileTypeMetrics(tile_types, sources);
 }
 
 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint index,
     jint tile_type,
     jint source) {
-  most_visited_.RecordOpenedMostVisitedItem(index, tile_type, source);
+  most_visited_.RecordOpenedMostVisitedItem(
+      index, static_cast<MostVisitedSites::MostVisitedTileType>(tile_type),
+      static_cast<NTPTileSource>(source));
 }
 
 // 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);
 }