🏠 Extract the ContentSuggestionManager interface from NTP

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 913e9c296123fbe5adb79fa84e4437b147e65a65..a3fb078c88917ebbd641220de594f196eb5a7fbd 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
@@ -31,7 +31,6 @@
 import org.chromium.chrome.browser.ntp.ContextMenuManager.ContextMenuItemId;
 import org.chromium.chrome.browser.ntp.ContextMenuManager.Delegate;
 import org.chromium.chrome.browser.ntp.DisplayStyleObserver;
-import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.UiConfig;
 import org.chromium.chrome.browser.ntp.cards.CardViewHolder;
 import org.chromium.chrome.browser.ntp.cards.CardsVariationParameters;
@@ -39,6 +38,7 @@
 import org.chromium.chrome.browser.ntp.cards.ImpressionTracker;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerView;
 import org.chromium.chrome.browser.ntp.cards.SuggestionsCategoryInfo;
+import org.chromium.chrome.browser.suggestions.ContentSuggestionsManager;
 import org.chromium.ui.mojom.WindowOpenDisposition;
 
 import java.net.URI;
@@ -59,7 +59,7 @@
 
     public static final int PARTIAL_UPDATE_OFFLINE_ID = 1;
 
-    private final NewTabPageManager mNewTabPageManager;
+    private final ContentSuggestionsManager mContentSuggestionsManager;
     private final TextView mHeadlineTextView;
     private final TextView mPublisherTextView;
     private final TextView mArticleSnippetTextView;
@@ -77,16 +77,17 @@
 
     /**
      * Constructs a {@link SnippetArticleViewHolder} item used to display snippets.
-     *
-     * @param parent The NewTabPageRecyclerView that is going to contain the newly created view.
+     *  @param parent The NewTabPageRecyclerView that is going to contain the newly created view.
+     * @param contextMenuManager
      * @param manager The NewTabPageManager object used to open an article.
      * @param uiConfig The NTP UI configuration object used to adjust the article UI.
      */
-    public SnippetArticleViewHolder(NewTabPageRecyclerView parent, NewTabPageManager manager,
+    public SnippetArticleViewHolder(NewTabPageRecyclerView parent,
+            ContextMenuManager contextMenuManager, ContentSuggestionsManager manager,
             UiConfig uiConfig) {
-        super(R.layout.new_tab_page_snippets_card, parent, uiConfig, manager);
+        super(R.layout.new_tab_page_snippets_card, parent, uiConfig, contextMenuManager);
 
-        mNewTabPageManager = manager;
+        mContentSuggestionsManager = manager;
         mThumbnailView = (ImageView) itemView.findViewById(R.id.article_thumbnail);
         mHeadlineTextView = (TextView) itemView.findViewById(R.id.article_headline);
         mPublisherTextView = (TextView) itemView.findViewById(R.id.article_publisher);
@@ -110,19 +111,19 @@ public void onDisplayStyleChanged(@UiConfig.DisplayStyle int newDisplayStyle) {
     @Override
     public void onImpression() {
         if (mArticle != null && mArticle.trackImpression()) {
-            mNewTabPageManager.trackSnippetImpression(mArticle);
+            mContentSuggestionsManager.trackSnippetImpression(mArticle);
             mRecyclerView.onSnippetImpression();
         }
     }
 
     @Override
     public void onCardTapped() {
-        mNewTabPageManager.openSnippet(WindowOpenDisposition.CURRENT_TAB, mArticle);
+        mContentSuggestionsManager.openSnippet(WindowOpenDisposition.CURRENT_TAB, mArticle);
     }
 
     @Override
     public void openItem(int windowDisposition) {
-        mNewTabPageManager.openSnippet(windowDisposition, mArticle);
+        mContentSuggestionsManager.openSnippet(windowDisposition, mArticle);
     }
 
     @Override
@@ -151,7 +152,7 @@ public boolean isItemSupported(@ContextMenuItemId int menuItemId) {
 
     @Override
     public void onContextMenuCreated() {
-        mNewTabPageManager.trackSnippetMenuOpened(mArticle);
+        mContentSuggestionsManager.trackSnippetMenuOpened(mArticle);
     }
 
     @Override
@@ -258,8 +259,8 @@ public void onBindViewHolder(
             } else {
                 mThumbnailView.setImageResource(R.drawable.ic_snippet_thumbnail_placeholder);
                 mImageCallback = new FetchImageCallback(this, mArticle);
-                mNewTabPageManager.getSuggestionsSource()
-                        .fetchSuggestionImage(mArticle, mImageCallback);
+                mContentSuggestionsManager.getSuggestionsSource().fetchSuggestionImage(
+                        mArticle, mImageCallback);
             }
         }
 
@@ -344,7 +345,7 @@ private void fadeThumbnailIn(SnippetArticle snippet, Bitmap thumbnail) {
     }
 
     private void fetchFaviconFromLocalCache(final URI snippetUri, final boolean fallbackToService) {
-        mNewTabPageManager.getLocalFaviconImageForURL(
+        mContentSuggestionsManager.getLocalFaviconImageForURL(
                 getSnippetDomain(snippetUri), mPublisherFaviconSizePx, new FaviconImageCallback() {
                     @Override
                     public void onFaviconAvailable(Bitmap image, String iconUrl) {
@@ -368,7 +369,7 @@ private void fetchFaviconFromService(final URI snippetUri) {
         if (sizePx == 0) return;
 
         // Replace the default icon by another one from the service when it is fetched.
-        mNewTabPageManager.ensureIconIsAvailable(
+        mContentSuggestionsManager.ensureIconIsAvailable(
                 getSnippetDomain(snippetUri), // Store to the cache for the whole domain.
                 String.format(FAVICON_SERVICE_FORMAT, snippetUri.getHost(), sizePx),
                 /*useLargeIcon=*/false, /*isTemporary=*/true, new IconAvailabilityCallback() {