📰 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..1e1be4ded7034b2564215cbd130ab2fa5c9ce9c0 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,7 +175,7 @@ public static void setSuggestionsSourceForTests(SuggestionsSource suggestionsSou
     private class NewTabPageManagerImpl
             extends SuggestionsUiDelegateImpl implements NewTabPageManager {
         public NewTabPageManagerImpl(SuggestionsSource suggestionsSource,
-                SuggestionsMetricsReporter metricsReporter,
+                SuggestionsEventReporter metricsReporter,

[Marc Treib, 2017/04/27 10:06:47]

s/metricsReporter/eventReporter/, in lots of places :)

[dgn, 2017/04/28 14:29:28]

Done.

                 SuggestionsNavigationDelegate navigationDelegate, Profile profile,
                 NativePageHost nativePageHost) {
             super(suggestionsSource, metricsReporter, navigationDelegate, profile, nativePageHost);
@@ -315,12 +316,13 @@ public NewTabPage(ChromeActivity activity, NativePageHost nativePageHost,
         Profile profile = mTab.getProfile();
 
         mSnippetsBridge = new SnippetsBridge(profile);
+        SuggestionsEventReporter eventReporter = new SuggestionsEventReporterBridge();

[dgn, 2017/04/27 09:53:19]

Not sure if it should be an instance like this since all the methods could be
static. Using an instance makes it possible to spy metrics calls, but we don't
currently make use of that. I can also make it a singleton and change the calls
to SuggestionsEventReporter.getInstance().onFooHappened()

[Marc Treib, 2017/04/27 10:06:47]

I'd probably go for making it static, but I think you need the interface/impl
split for tests? In which case IMO the current thing is fine.

 
         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);