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

chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java

Index: chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java b/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java
index c60da0ae7ca6e72d6c92953013be6e3d3bbf7c1f..923b3166a242aa5890311aa5dded8e9d0cce5672 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java
@@ -27,8 +27,8 @@ public class MostVisitedSites {
          *             visited URLs).
          */
         @CalledByNative("MostVisitedURLsObserver")
-        public void onMostVisitedURLsAvailable(
-                String[] titles, String[] urls, String[] whitelistIconPaths);
+        public void onMostVisitedURLsAvailable(String[] titles, String[] urls,
+                String[] whitelistIconPaths, int[] sources, int[] providerIndexes);
 
         /**
          * This is called when the list of popular URLs is initially available or updated.
@@ -72,11 +72,12 @@ public class MostVisitedSites {
     public void setMostVisitedURLsObserver(final MostVisitedURLsObserver observer, int numSites) {
         MostVisitedURLsObserver wrappedObserver = new MostVisitedURLsObserver() {
             @Override
-            public void onMostVisitedURLsAvailable(
-                    String[] titles, String[] urls, String[] whitelistIconPaths) {
+            public void onMostVisitedURLsAvailable(String[] titles, String[] urls,
+                    String[] whitelistIconPaths, int[] sources, int[] providerIndexes) {
                 // Don't notify observer if we've already been destroyed.
                 if (mNativeMostVisitedSitesBridge != 0) {
-                    observer.onMostVisitedURLsAvailable(titles, urls, whitelistIconPaths);
+                    observer.onMostVisitedURLsAvailable(
+                            titles, urls, whitelistIconPaths, sources, providerIndexes);
                 }
             }
             @Override
@@ -107,15 +108,6 @@ public class MostVisitedSites {
     }
 
     /**
-     * Records metrics about which types of tiles are displayed.
-     * @param tileTypes An array of values from MostVisitedTileType indicating the type of each
-     *                  tile that's currently showing.
-     */
-    public void recordTileTypeMetrics(int[] tileTypes) {
-        nativeRecordTileTypeMetrics(mNativeMostVisitedSitesBridge, tileTypes);
-    }
-
-    /**
      * Records the opening of a Most Visited Item.
      * @param index The index of the item that was opened.
      * @param tileType The visual type of the item. Valid values are listed in MostVisitedTileType.
@@ -131,8 +123,6 @@ public class MostVisitedSites {
     private native void nativeAddOrRemoveBlacklistedUrl(
             long nativeMostVisitedSitesBridge, String url,
             boolean addUrl);
-    private native void nativeRecordTileTypeMetrics(
-            long nativeMostVisitedSitesBridge, int[] tileTypes);
     private native void nativeRecordOpenedMostVisitedItem(
             long nativeMostVisitedSitesBridge, int index, int tileType);