📰 Tweak the suggestion ranks for UMA to handle fetchMore

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java
index 7bb36163aee77476e4905ecc014674e81d4ddbf4..92cdf2b204007c34489c183ac59f993a6368d993 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java
@@ -70,7 +70,6 @@
     private FetchImageCallback mImageCallback;
     private SnippetArticle mArticle;
     private SuggestionsCategoryInfo mCategoryInfo;
-    private int mCategoryIndex;
     private int mPublisherFaviconSizePx;
 
     private final boolean mUseFaviconService;
@@ -111,19 +110,19 @@ public void onDisplayStyleChanged(@UiConfig.DisplayStyle int newDisplayStyle) {
     @Override
     public void onImpression() {
         if (mArticle != null && mArticle.trackImpression()) {
-            mNewTabPageManager.trackSnippetImpression(mArticle);
+            mNewTabPageManager.getSuggestionsMetricsReporter().onSuggestionShown(mArticle);
             mRecyclerView.onSnippetImpression();
         }
     }
 
     @Override
     public void onCardTapped() {
-        mNewTabPageManager.openSnippet(WindowOpenDisposition.CURRENT_TAB, mArticle, mCategoryIndex);
+        mNewTabPageManager.openSnippet(WindowOpenDisposition.CURRENT_TAB, mArticle);
     }
 
     @Override
     public void openItem(int windowDisposition) {
-        mNewTabPageManager.openSnippet(windowDisposition, mArticle, mCategoryIndex);
+        mNewTabPageManager.openSnippet(windowDisposition, mArticle);
     }
 
     @Override
@@ -152,7 +151,7 @@ public boolean isItemSupported(@ContextMenuItemId int menuItemId) {
 
     @Override
     public void onContextMenuCreated() {
-        mNewTabPageManager.trackSnippetMenuOpened(mArticle);
+        mNewTabPageManager.getSuggestionsMetricsReporter().onSuggestionMenuOpened(mArticle);
     }
 
     @Override
@@ -224,8 +223,8 @@ private static String getAttributionString(SnippetArticle article) {
                 BidiFormatter.getInstance().unicodeWrap(article.mPublisher), relativeTimeSpan);
     }
 
-    public void onBindViewHolder(SnippetArticle article, SuggestionsCategoryInfo categoryInfo,
-            List<Object> payloads, int categoryIndex) {
+    public void onBindViewHolder(
+            SnippetArticle article, SuggestionsCategoryInfo categoryInfo, List<Object> payloads) {
         if (!payloads.isEmpty() && article.equals(mArticle)) {
             performPartialBind(payloads);
             return;
@@ -235,7 +234,6 @@ public void onBindViewHolder(SnippetArticle article, SuggestionsCategoryInfo cat
 
         mArticle = article;
         mCategoryInfo = categoryInfo;
-        mCategoryIndex = categoryIndex;
         updateLayout();
 
         mHeadlineTextView.setText(mArticle.mTitle);