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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
 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;
 import org.chromium.chrome.browser.document.DocumentMetricIds;
 import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkUtils;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconAvailabilityCallback;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
@@ skipping 20 matching lines @@
 import org.chromium.ui.base.PageTransition;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * Provides functionality when the user interacts with the NTP.
  */
 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.
     static final int ID_OPEN_IN_NEW_TAB = 0;
     static final int ID_OPEN_IN_INCOGNITO_TAB = 1;
     static final int ID_REMOVE = 2;
 
     private static MostVisitedSites sMostVisitedSitesForTests;
 
     private final Tab mTab;
     private final TabModelSelector mTabModelSelector;
     private final Activity mActivity;
 
     private final Profile mProfile;
     private final String mTitle;
     private final int mBackgroundColor;
     private final NewTabPageView mNewTabPageView;
 
     private MostVisitedSites mMostVisitedSites;
     private FaviconHelper mFaviconHelper;
     private LargeIconBridge mLargeIconBridge;
     private LogoBridge mLogoBridge;
     private boolean mSearchProviderHasLogo;
+    private boolean mIsIconMode;
     private final boolean mOptOutPromoShown;
     private String mOnLogoClickUrl;
     private FakeboxDelegate mFakeboxDelegate;
 
     // The timestamp at which the constructor was called.
     private final long mConstructedTimeNs;
 
     private boolean mIsLoaded;
 
     // Whether destroy() has been called.
@@ skipping 91 matching lines @@
 
         private void recordOpenedMostVisitedItem(MostVisitedItem item) {
             if (mIsDestroyed) return;
             NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_MOST_VISITED_ENTRY);
             NewTabPageUma.recordExplicitUserNavigation(
                     item.getUrl(), NewTabPageUma.RAPPOR_ACTION_VISITED_SUGGESTED_TILE);
             RecordHistogram.recordEnumeratedHistogram("NewTabPage.MostVisited", item.getIndex(),
                     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) {
             RecordHistogram.recordEnumeratedHistogram("DocumentActivity.OptOutClick", which,
                     DocumentMetricIds.OPT_OUT_CLICK_COUNT);
         }
 
         @Override
         public boolean shouldShowOptOutPromo() {
             if (!FeatureUtilities.isDocumentMode(mActivity)) return false;
@@ skipping 154 matching lines @@
                 public void onLogoAvailable(Logo logo, boolean fromCache) {
                     if (mIsDestroyed) return;
                     mOnLogoClickUrl = logo != null ? logo.onClickUrl : null;
                     logoObserver.onLogoAvailable(logo, fromCache);
                 }
             };
             mLogoBridge.getCurrentLogo(wrapperCallback);
         }
 
         @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);
         }
     };
 
     /**
      * Constructs a NewTabPage.
      * @param activity The activity used for context to create the new tab page's View.
      * @param tab The Tab that is showing this new tab page.
      * @param tabModelSelector The TabModelSelector used to open tabs.
      */
     public NewTabPage(Activity activity, Tab tab, TabModelSelector tabModelSelector) {
@@ skipping 12 matching lines @@
         // because the user can dismiss the promo.  To ensure the UI is consistent, cache the
         // value initially and ignore further updates.
         mOptOutPromoShown = mNewTabPageManager.shouldShowOptOutPromo();
 
         mMostVisitedSites = buildMostVisitedSites(mProfile);
         mLogoBridge = new LogoBridge(mProfile);
         updateSearchProviderHasLogo();
 
         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) {
         if (sMostVisitedSitesForTests != null) {
             return sMostVisitedSitesForTests;
         } else {
             return new MostVisitedSites(profile);
         }
     }
 
+    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() {
         return mNewTabPageView;
     }
 
     /**
      * Updates whether the NewTabPage should animate on URL focus changes.
      * @param disable Whether to disable the animations.
      */
@@ skipping 169 matching lines @@
         public void onBookmarkSelected(String url, String title, Bitmap favicon) {
             if (mDialog != null) mDialog.dismiss();
             mTab.loadUrl(new LoadUrlParams(url));
         }
 
         public void setDialog(Dialog dialog) {
             mDialog = dialog;
         }
     }
 }