📰 Tweak the suggestion ranks for UMA to handle fetchMore

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.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Point;
@@ skipping 311 matching lines @@
             return false;
         }
 
         private boolean matchURLs(String url1, String url2, boolean matchByHost) {
             if (url1 == null || url2 == null) return false;
             return matchByHost ? UrlUtilities.sameHost(url1, url2) : url1.equals(url2);
         }
 
         @Override
         public void trackSnippetsPageImpression(int[] categories, int[] suggestionsPerCategory) {
+            if (sSuggestionsSourceForTests != null) return;

[Bernhard Bauer, 2017/01/11 13:53:38]

Could we instead move these tracking methods into an interface? It could be
SuggestionsSource, or we could add a new interface that SnippetsBridge
implements, to keep SuggestionsSource from blowing up too much.

[dgn, 2017/01/12 14:29:58]

Sure! I was thinking about doing that in another patch at first, but here it
comes anyway :)

             mSnippetsBridge.onPageShown(categories, suggestionsPerCategory);
         }
 
         @Override
         public void trackSnippetImpression(SnippetArticle article) {
+            if (sSuggestionsSourceForTests != null) return;
             mSnippetsBridge.onSuggestionShown(article);
         }
 
         @Override
         public void trackSnippetMenuOpened(SnippetArticle article) {
+            if (sSuggestionsSourceForTests != null) return;
             mSnippetsBridge.onSuggestionMenuOpened(article);
         }
 
         @Override
         public void trackSnippetCategoryActionImpression(int category, int position) {
+            if (sSuggestionsSourceForTests != null) return;
             mSnippetsBridge.onMoreButtonShown(category, position);
         }
 
         @Override
         public void trackSnippetCategoryActionClick(int category, int position) {
+            if (sSuggestionsSourceForTests != null) return;
             mSnippetsBridge.onMoreButtonClicked(category, position);
             switch (category) {
                 case KnownCategories.BOOKMARKS:
                     NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_BOOKMARKS_MANAGER);
                     break;
                 // MORE button in both categories leads to the recent tabs manager
                 case KnownCategories.FOREIGN_TABS:
                 case KnownCategories.RECENT_TABS:
                     NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_RECENT_TABS_MANAGER);
                     break;
                 case KnownCategories.DOWNLOADS:
                     NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
                     break;
                 default:
                     // No action associated
                     break;
             }
         }
 
         @Override
         public void openSnippet(int windowOpenDisposition, SnippetArticle article) {
-            mSnippetsBridge.onSuggestionOpened(article, windowOpenDisposition);
+            if (sSuggestionsSourceForTests != null) {
+                mSnippetsBridge.onSuggestionOpened(article, windowOpenDisposition);
+            }
             NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_SNIPPET);
 
             if (article.mIsAssetDownload) {
                 assert windowOpenDisposition == WindowOpenDisposition.CURRENT_TAB
                         || windowOpenDisposition == WindowOpenDisposition.NEW_WINDOW
                         || windowOpenDisposition == WindowOpenDisposition.NEW_FOREGROUND_TAB;
                 DownloadUtils.openFile(
                         article.getAssetDownloadFile(), article.getAssetDownloadMimeType(), false);
                 return;
             }
@@ skipping 673 matching lines @@
     @Override
     public boolean shouldCaptureThumbnail() {
         return mNewTabPageView.shouldCaptureThumbnail();
     }
 
     @Override
     public void captureThumbnail(Canvas canvas) {
         mNewTabPageView.captureThumbnail(canvas);
     }
 }