NTP: Fix metrics recording crash by plumbing the necessary data to Java.

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 18 matching lines @@
 #include "content/public/browser/url_data_source.h"
 #include "jni/MostVisitedSites_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 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 suggestions::SuggestionsServiceFactory;
 
 MostVisitedSitesBridge::SupervisorBridge::SupervisorBridge(Profile* profile)
     : profile_(profile),
       supervisor_observer_(nullptr),
       register_observer_(this) {
   register_observer_.Add(SupervisedUserServiceFactory::GetForProfile(profile_));
@@ skipping 62 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj)
     : observer_(env, obj) {}
 
 void MostVisitedSitesBridge::JavaObserver::OnMostVisitedURLsAvailable(
     const MostVisitedSites::SuggestionsVector& suggestions) {
   JNIEnv* env = AttachCurrentThread();
   std::vector<base::string16> titles;
   std::vector<std::string> urls;
   std::vector<std::string> whitelist_icon_paths;
+  std::vector<int> sources;
+  std::vector<int> provider_indexes;
+
   titles.reserve(suggestions.size());
   urls.reserve(suggestions.size());
   whitelist_icon_paths.reserve(suggestions.size());

[Marc Treib, 2016/06/29 08:19:31]

Also reserve sources and provider_indexes

[dewittj, 2016/06/30 17:48:54]

Done.

   for (const auto& suggestion : suggestions) {
     titles.emplace_back(suggestion.title);
     urls.emplace_back(suggestion.url.spec());
     whitelist_icon_paths.emplace_back(suggestion.whitelist_icon_path.value());
+    sources.emplace_back(suggestion.source);
+    provider_indexes.emplace_back(suggestion.provider_index);
   }
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj(),
-      ToJavaArrayOfStrings(env, whitelist_icon_paths).obj());
+      ToJavaArrayOfStrings(env, whitelist_icon_paths).obj(),
+      ToJavaIntArray(env, sources).obj(),
+      ToJavaIntArray(env, provider_indexes).obj());
 }
 
 void MostVisitedSitesBridge::JavaObserver::OnPopularURLsAvailable(
     const MostVisitedSites::PopularSitesVector& sites) {
   JNIEnv* env = AttachCurrentThread();
   std::vector<std::string> urls;
   std::vector<std::string> favicon_urls;
   std::vector<std::string> large_icon_urls;
   for (const auto& site : sites) {
     urls.emplace_back(site.url.spec());
@@ skipping 40 matching lines @@
 
 void MostVisitedSitesBridge::AddOrRemoveBlacklistedUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_url,
     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) {
-  std::vector<int> tile_types;
-  base::android::JavaIntArrayToIntVector(env, jtile_types, &tile_types);
-  most_visited_.RecordTileTypeMetrics(tile_types);
-}
-
 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint index,
     jint tile_type) {
   most_visited_.RecordOpenedMostVisitedItem(index, 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);
 }