Add UMA stats for which icon types are shown and clicked on the NTP.

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
index 2edbf6eaf404192a0a77899c15165133e9f358f4..733d68e7e9b1a2bb61cdb60f5e8e8f7259900e81 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -17,10 +17,13 @@ import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 
 import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.CommandLine;
+import org.chromium.base.FieldTrialList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.compositor.layouts.content.InvalidationAwareThumbnailProvider;
@@ -61,7 +64,10 @@ import java.util.concurrent.TimeUnit;
 public class NewTabPage
         implements NativePage, InvalidationAwareThumbnailProvider, TemplateUrlServiceObserver {
 
-    // The number of times that an opt-out promo will be shown.
+    private static final String ICON_NTP_FIELD_TRIAL_NAME = "IconNTP";

[newt (away), 2015/09/28 22:34:21]

I moved finch logic from NewTabPageView to NewTabPage because 1) NewTabPage
needs to know about the icon-NTP finch group now, and 2) this logic really
belongs in the manager, not the view, anyway.

+    private static final String ICON_NTP_ENABLED_GROUP = "Enabled";
+
+    // The number of times that the document-mode opt-out promo will be shown.
     private static final int MAX_OPT_OUT_PROMO_COUNT = 10;
 
     // MostVisitedItem Context menu item IDs.
@@ -85,6 +91,7 @@ public class NewTabPage
     private LargeIconBridge mLargeIconBridge;
     private LogoBridge mLogoBridge;
     private boolean mSearchProviderHasLogo;
+    private boolean mIsIconMode;
     private final boolean mOptOutPromoShown;
     private String mOnLogoClickUrl;
     private FakeboxDelegate mFakeboxDelegate;
@@ -196,7 +203,7 @@ public class NewTabPage
                     NewTabPageView.MAX_MOST_VISITED_SITES);
             RecordHistogram.recordMediumTimesHistogram("NewTabPage.MostVisitedTime",
                     System.nanoTime() - mConstructedTimeNs, TimeUnit.NANOSECONDS);
-            mMostVisitedSites.recordOpenedMostVisitedItem(item.getIndex());
+            mMostVisitedSites.recordOpenedMostVisitedItem(item.getIndex(), item.getTileType());
         }
 
         private void recordDocumentOptOutPromoClick(int which) {
@@ -371,14 +378,19 @@ public class NewTabPage
         }
 
         @Override
-        public void onLoadingComplete() {
+        public void onLoadingComplete(MostVisitedItem[] items) {
             long loadTimeMs = (System.nanoTime() - mConstructedTimeNs) / 1000000;
             RecordHistogram.recordTimesHistogram(
                     "Tab.NewTabOnload", loadTimeMs, TimeUnit.MILLISECONDS);
             mIsLoaded = true;
 
             if (mIsDestroyed) return;
-            mMostVisitedSites.onLoadingComplete();
+
+            int tileTypes[] = new int[items.length];
+            for (int i = 0; i < items.length; i++) {
+                tileTypes[i] = items[i].getTileType();
+            }
+            mMostVisitedSites.recordTileTypeMetrics(tileTypes, mIsIconMode);
         }
     };
 
@@ -411,8 +423,9 @@ public class NewTabPage
 
         LayoutInflater inflater = LayoutInflater.from(activity);
         mNewTabPageView = (NewTabPageView) inflater.inflate(R.layout.new_tab_page, null);
+        mIsIconMode = isIconNtpEnabled();
         mNewTabPageView.initialize(mNewTabPageManager, isInSingleUrlBarMode(activity),
-                mSearchProviderHasLogo);
+                mSearchProviderHasLogo, mIsIconMode);
     }
 
     private static MostVisitedSites buildMostVisitedSites(Profile profile) {
@@ -423,6 +436,15 @@ public class NewTabPage
         }
     }
 
+    private boolean isIconNtpEnabled() {
+        // Query the field trial state first, to ensure that UMA reports the correct group.
+        String fieldTrialGroup = FieldTrialList.findFullName(ICON_NTP_FIELD_TRIAL_NAME);
+        CommandLine commandLine = CommandLine.getInstance();
+        if (commandLine.hasSwitch(ChromeSwitches.DISABLE_ICON_NTP)) return false;
+        if (commandLine.hasSwitch(ChromeSwitches.ENABLE_ICON_NTP)) return true;
+        return fieldTrialGroup.equals(ICON_NTP_ENABLED_GROUP);
+    }
+
     /** @return The view container for the new tab page. */
     @VisibleForTesting
     NewTabPageView getNewTabPageView() {