Remove some dead Zine code

 - Offline pages integration with zine is not needed,
   since Zine is iOS only, and offline_pages is Android only.
   This includes code in both ntp_snippets/ and offline_pages/.
 - Remove SuggestionsEventReporter Java integration, none of these
   apply to the new Feed.

Bug: 1069183
Change-Id: Icd538c9cac875c0f656e6a1f2893ef238e313142
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405810
Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Dan H <harringtond@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808401}

chrome/android/BUILD.gn

@@ -3187,7 +3187,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/signin/WebSigninBridge.java",
     "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
     "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
-    "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporterBridge.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java",
     "java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java",

chrome/android/chrome_java_sources.gni

@@ -1426,8 +1426,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/suggestions/SiteSuggestion.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsDependencyFactory.java",
-  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporter.java",
-  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporterBridge.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsMetrics.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsOfflineModelObserver.java",

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/MostVisitedListCoordinator.java

@@ -14,7 +14,6 @@
 import org.chromium.chrome.browser.suggestions.ImageFetcher;
 import org.chromium.chrome.browser.suggestions.SuggestionsConfig;
 import org.chromium.chrome.browser.suggestions.SuggestionsDependencyFactory;
-import org.chromium.chrome.browser.suggestions.SuggestionsEventReporter;
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegate;
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegateImpl;
 import org.chromium.chrome.browser.suggestions.tile.SuggestionsTileView;
@@ -60,8 +59,6 @@ public void initialize() {
 
         // This function is never called in incognito mode.
         Profile profile = Profile.getLastUsedRegularProfile();
-        SuggestionsEventReporter eventReporter =
-                SuggestionsDependencyFactory.getInstance().createEventReporter();
 
         ImageFetcher imageFetcher = new ImageFetcher(profile);
         SnackbarManager snackbarManager = mActivity.getSnackbarManager();
@@ -75,7 +72,7 @@ public void initialize() {
         TileGroupDelegateImpl tileGroupDelegate =
                 new TileGroupDelegateImpl(mActivity, profile, null, snackbarManager);
         SuggestionsUiDelegate suggestionsUiDelegate =
-                new MostVisitedSuggestionsUiDelegate(eventReporter, profile, snackbarManager);
+                new MostVisitedSuggestionsUiDelegate(profile, snackbarManager);
         mTileGroup = new TileGroup(
                 mRenderer, suggestionsUiDelegate, null, tileGroupDelegate, this, offlinePageBridge);
         mTileGroup.startObserving(MAX_RESULTS);
@@ -164,9 +161,8 @@ public void onCreateContextMenu(
 
     /** Suggestions UI Delegate for constructing the TileGroup. */
     private static class MostVisitedSuggestionsUiDelegate extends SuggestionsUiDelegateImpl {
-        public MostVisitedSuggestionsUiDelegate(SuggestionsEventReporter eventReporter,
-                Profile profile, SnackbarManager snackbarManager) {
-            super(eventReporter, null, profile, null, snackbarManager);
+        public MostVisitedSuggestionsUiDelegate(Profile profile, SnackbarManager snackbarManager) {
+            super(null, profile, null, snackbarManager);
         }
 
         @Override

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -110,7 +110,6 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
 import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification;
-import org.chromium.chrome.browser.suggestions.SuggestionsEventReporterBridge;
 import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
 import org.chromium.chrome.browser.survey.ChromeSurveyController;
 import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper;
@@ -796,14 +795,6 @@ && shouldShowTabSwitcherOnStart() && mTabModelSelectorImpl.isIncognitoSelected()
         mLocaleManager.setSnackbarManager(getSnackbarManager());
         mLocaleManager.startObservingPhoneChanges();
 
-        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)) {
-            if (isWarmOnResume()) {
-                SuggestionsEventReporterBridge.onActivityWarmResumed();
-            } else {
-                SuggestionsEventReporterBridge.onColdStart();
-            }
-        }
-
         if (isWarmOnResume()) {
             NavigationPredictorBridge.onActivityWarmResumed();
         } else {

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

@@ -51,7 +51,6 @@
 import org.chromium.chrome.browser.query_tiles.QueryTileSection.QueryInfo;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.suggestions.SuggestionsDependencyFactory;
-import org.chromium.chrome.browser.suggestions.SuggestionsEventReporter;
 import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
 import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegate;
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegateImpl;
@@ -183,10 +182,9 @@ public static boolean isNTPUrl(String url) {
 
     protected class NewTabPageManagerImpl
             extends SuggestionsUiDelegateImpl implements NewTabPageManager {
-        public NewTabPageManagerImpl(SuggestionsEventReporter eventReporter,
-                SuggestionsNavigationDelegate navigationDelegate, Profile profile,
-                NativePageHost nativePageHost, SnackbarManager snackbarManager) {
-            super(eventReporter, navigationDelegate, profile, nativePageHost, snackbarManager);
+        public NewTabPageManagerImpl(SuggestionsNavigationDelegate navigationDelegate,
+                Profile profile, NativePageHost nativePageHost, SnackbarManager snackbarManager) {
+            super(navigationDelegate, profile, nativePageHost, snackbarManager);
         }
 
         @Override
@@ -307,12 +305,11 @@ public NewTabPage(Activity activity, BrowserControlsStateProvider browserControl
         Profile profile = Profile.fromWebContents(mTab.getWebContents());
 
         SuggestionsDependencyFactory depsFactory = SuggestionsDependencyFactory.getInstance();
-        SuggestionsEventReporter eventReporter = depsFactory.createEventReporter();
 
         SuggestionsNavigationDelegate navigationDelegate = new SuggestionsNavigationDelegate(
                 activity, profile, nativePageHost, tabModelSelector, mTab);
         mNewTabPageManager = new NewTabPageManagerImpl(
-                eventReporter, navigationDelegate, profile, nativePageHost, snackbarManager);
+                navigationDelegate, profile, nativePageHost, snackbarManager);
         mTileGroupDelegate = new NewTabPageTileGroupDelegate(
                 activity, profile, navigationDelegate, snackbarManager);
 
@@ -374,8 +371,6 @@ public void onViewDetachedFromWindow(View view) {}
         });
         mBrowserControlsStateProvider.addObserver(this);
 
-        eventReporter.onSurfaceOpened();
-
         DownloadManagerService.getDownloadManagerService().checkForExternallyRemovedDownloads(
                 /*isOffTheRecord=*/false);
 

chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsDependencyFactory.java

@@ -36,10 +36,6 @@ public static void setInstanceForTesting(SuggestionsDependencyFactory testInstan
         sInstance = testInstance;
     }
 
-    public SuggestionsEventReporter createEventReporter() {
-        return new SuggestionsEventReporterBridge();
-    }
-
     public MostVisitedSites createMostVisitedSites(Profile profile) {
         return new MostVisitedSitesBridge(profile);
     }

chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsUiDelegate.java

@@ -14,9 +14,6 @@ public interface SuggestionsUiDelegate {
     // TODO(dgn): remove these methods once the users have a different way to get a reference
     // to these objects (https://crbug.com/677672)
 
-    /** Convenience method to access the {@link SuggestionsEventReporter}. */
-    SuggestionsEventReporter getEventReporter();
-
     /** Convenience method to access the {@link SuggestionsNavigationDelegate}. */
     SuggestionsNavigationDelegate getNavigationDelegate();
 
@@ -35,4 +32,4 @@ public interface SuggestionsUiDelegate {
 
     /** @return Whether the suggestions UI is currently visible. */
     boolean isVisible();
-}
+}

chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsUiDelegateImpl.java

@@ -18,31 +18,22 @@
  */
 public class SuggestionsUiDelegateImpl implements SuggestionsUiDelegate {
     private final List<DestructionObserver> mDestructionObservers = new ArrayList<>();
-    private final SuggestionsEventReporter mSuggestionsEventReporter;
     private final SuggestionsNavigationDelegate mSuggestionsNavigationDelegate;
     private final NativePageHost mHost;
     private final ImageFetcher mImageFetcher;
     private final SnackbarManager mSnackbarManager;
 
     private boolean mIsDestroyed;
 
-    public SuggestionsUiDelegateImpl(SuggestionsEventReporter eventReporter,
-            SuggestionsNavigationDelegate navigationDelegate, Profile profile, NativePageHost host,
-            SnackbarManager snackbarManager) {
-        mSuggestionsEventReporter = eventReporter;
+    public SuggestionsUiDelegateImpl(SuggestionsNavigationDelegate navigationDelegate,
+            Profile profile, NativePageHost host, SnackbarManager snackbarManager) {
         mSuggestionsNavigationDelegate = navigationDelegate;
         mImageFetcher = new ImageFetcher(profile);
         mSnackbarManager = snackbarManager;
 
         mHost = host;
     }
 
-    @Nullable
-    @Override
-    public SuggestionsEventReporter getEventReporter() {
-        return mSuggestionsEventReporter;
-    }
-
     @Nullable
     @Override
     public SuggestionsNavigationDelegate getNavigationDelegate() {

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchFeedFlowTest.java

@@ -259,7 +259,6 @@ public void offlinePageAdded(OfflinePageItem addedPage) {
                         }
                     });
             PrefetchTestBridge.enableLimitlessPrefetching(true);
-            PrefetchTestBridge.skipNTPSuggestionsAPIKeyCheck();
         });
 
         OfflineTestUtil.setPrefetchingEnabledByServer(true);

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java

@@ -15,9 +15,6 @@ public static void enableLimitlessPrefetching(boolean enabled) {
     public static boolean isLimitlessPrefetchingEnabled() {
         return nativeIsLimitlessPrefetchingEnabled();
     }
-    public static void skipNTPSuggestionsAPIKeyCheck() {
-        nativeSkipNTPSuggestionsAPIKeyCheck();
-    }
     public static void insertIntoCachedImageFetcher(String url, byte[] imageData) {
         nativeInsertIntoCachedImageFetcher(url, imageData);
     }
@@ -28,7 +25,6 @@ public static void addCandidatePrefetchURL(String url, String title, String thum
 
     static native void nativeEnableLimitlessPrefetching(boolean enabled);
     static native boolean nativeIsLimitlessPrefetchingEnabled();
-    static native void nativeSkipNTPSuggestionsAPIKeyCheck();
     static native void nativeInsertIntoCachedImageFetcher(String url, byte[] imageData);
     static native void nativeAddCandidatePrefetchURL(String url, String title, String thumbnailUrl,
             String faviconUrl, String snippet, String attribution);

chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayoutTest.java

@@ -324,8 +324,7 @@ private SiteSection createSiteSection(
         // TODO (https://crbug.com/1063807):  Add incognito mode tests.
         Profile profile = Profile.getLastUsedRegularProfile();
         SuggestionsUiDelegate uiDelegate =
-                new SuggestionsUiDelegateImpl(mSuggestionsDeps.getFactory().createEventReporter(),
-                        null, profile, null, activity.getSnackbarManager());
+                new SuggestionsUiDelegateImpl(null, profile, null, activity.getSnackbarManager());
 
         FakeOfflinePageBridge offlinePageBridge = new FakeOfflinePageBridge();
         List<OfflinePageItem> offlinePageItems = new ArrayList<>();

chrome/browser/BUILD.gn

@@ -2653,7 +2653,6 @@ static_library("browser") {
       "android/ntp/ntp_snippets_launcher.h",
       "android/ntp/recent_tabs_page_prefs.cc",
       "android/ntp/recent_tabs_page_prefs.h",
-      "android/ntp/suggestions_event_reporter_bridge.cc",
       "android/omnibox/autocomplete_controller_android.cc",
       "android/omnibox/autocomplete_controller_android.h",
       "android/omnibox/omnibox_prerender.cc",
@@ -5610,8 +5609,6 @@ static_library("browser") {
       "offline_pages/prefetch/prefetch_service_factory.h",
       "offline_pages/prefetch/prefetched_pages_notifier.cc",
       "offline_pages/prefetch/prefetched_pages_notifier.h",
-      "offline_pages/prefetch/thumbnail_fetcher_impl.cc",
-      "offline_pages/prefetch/thumbnail_fetcher_impl.h",
       "offline_pages/recent_tab_helper.cc",
       "offline_pages/recent_tab_helper.h",
       "offline_pages/request_coordinator_factory.h",