📰 Move metrics and scheduling events out of SnippetsBridge

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
index 980060bda9904f54560556121659dd70b6ac0c22..7909168d0244263d7383aea662b811c8d2a61a5d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -39,7 +39,8 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
-import org.chromium.chrome.browser.suggestions.SuggestionsMetricsReporter;
+import org.chromium.chrome.browser.suggestions.SuggestionsEventReporter;
+import org.chromium.chrome.browser.suggestions.SuggestionsEventReporterBridge;
 import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegate;
 import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegateImpl;
 import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegateImpl;
@@ -174,10 +175,10 @@ public static void setSuggestionsSourceForTests(SuggestionsSource suggestionsSou
     private class NewTabPageManagerImpl
             extends SuggestionsUiDelegateImpl implements NewTabPageManager {
         public NewTabPageManagerImpl(SuggestionsSource suggestionsSource,
-                SuggestionsMetricsReporter metricsReporter,
+                SuggestionsEventReporter eventReporter,
                 SuggestionsNavigationDelegate navigationDelegate, Profile profile,
                 NativePageHost nativePageHost) {
-            super(suggestionsSource, metricsReporter, navigationDelegate, profile, nativePageHost);
+            super(suggestionsSource, eventReporter, navigationDelegate, profile, nativePageHost);
         }
 
         @Override
@@ -315,12 +316,13 @@ public NewTabPage(ChromeActivity activity, NativePageHost nativePageHost,
         Profile profile = mTab.getProfile();
 
         mSnippetsBridge = new SnippetsBridge(profile);
+        SuggestionsEventReporter eventReporter = new SuggestionsEventReporterBridge();
 
         SuggestionsNavigationDelegateImpl navigationDelegate =
                 new SuggestionsNavigationDelegateImpl(
                         activity, profile, nativePageHost, tabModelSelector);
         mNewTabPageManager = new NewTabPageManagerImpl(
-                mSnippetsBridge, mSnippetsBridge, navigationDelegate, profile, nativePageHost);
+                mSnippetsBridge, eventReporter, navigationDelegate, profile, nativePageHost);
         mTileGroupDelegate = new NewTabPageTileGroupDelegate(
                 activity, profile, tabModelSelector, navigationDelegate);
 
@@ -375,9 +377,7 @@ public void onPageLoadStarted(Tab tab, String url) {
         mNewTabPageView.initialize(mNewTabPageManager, mTab, mTileGroupDelegate,
                 mSearchProviderHasLogo, getScrollPositionFromNavigationEntry());
 
-        if (mSnippetsBridge != null) {
-            mSnippetsBridge.onNtpInitialized();
-        }
+        eventReporter.onSurfaceOpened();
 
         DownloadManagerService.getDownloadManagerService().checkForExternallyRemovedDownloads(
                 /*isOffRecord=*/false);