[Offline pages] Refactoring: Merge Connectivity Listener into TabObserver

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
index 4bfa62a749506497a58ec8f39bedb51d7508b7b5..2c81db52b304438cbb0eedfca483e2b2f9aabfb4 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java
@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageMod
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController;
+import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.components.offlinepages.SavePageResult;
 import org.chromium.content.browser.test.util.Criteria;
@@ -92,14 +93,14 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
      * Mock implementation of the SnackbarController.
      */
     static class MockSnackbarController implements SnackbarController {
-        private int mButtonType;
+        private int mTabId;
         private boolean mDismissed;
         private static final long SNACKBAR_TIMEOUT = 7 * 1000;
         private static final long POLLING_INTERVAL = 100;
 
         public MockSnackbarController() {
             super();
-            mButtonType = OfflinePageUtils.RELOAD_BUTTON;
+            mTabId = Tab.INVALID_TAB_ID;
             mDismissed = false;
         }
 
@@ -121,19 +122,19 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
         @Override
         public void onAction(Object actionData) {
             Log.d(TAG, "onAction for snackbar");
-            mButtonType = (int) actionData;
+            mTabId = (int) actionData;
         }
 
         @Override
         public void onDismissNoAction(Object actionData) {
             Log.d(TAG, "onDismissNoAction for snackbar");
             if (actionData == null) return;
-            mButtonType = (int) actionData;
+            mTabId = (int) actionData;

[Pete Williamson, 2016/03/28 19:52:38]

How does the tab id make it into action data?  I missed that somehow in my
review.

[fgorski, 2016/03/28 22:52:32]

It is passed as action data when the reload snackbar is shown in
OfflinePageUtils#showReloadSnackbar. setAction(..., tabId) 

             mDismissed = true;
         }
 
-        public int getLastButtonType() {
-            return mButtonType;
+        public int getLastTabId() {
+            return mTabId;
         }
 
         public boolean getDismissed() {
@@ -167,15 +168,17 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
         loadUrl(offlinePageUrl);
         Log.d(TAG, "Calling showOfflineSnackbarIfNecessary from test");
 
+        int tabId = getActivity().getActivityTab().getId();
+
         // Act.  This needs to be called from the UI thread.
         Log.d(TAG, "before connecting NCN online state " + NetworkChangeNotifier.isOnline());
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 Log.d(TAG, "Showing offline snackbar from UI thread");
-                OfflinePageUtils.showOfflineSnackbarIfNecessary(getActivity().getBaseContext(),
-                        getActivity().getSnackbarManager(), getActivity().getActivityTab(),
-                        mockSnackbarController);
+                OfflinePageTabObserver.init(getActivity().getBaseContext(),
+                        getActivity().getSnackbarManager(), mockSnackbarController);
+                OfflinePageUtils.showOfflineSnackbarIfNecessary(getActivity().getActivityTab());
 
                 // Pretend that we went online, this should cause the snackbar to show.
                 // This call will set the isConnected call to return true.
@@ -190,9 +193,9 @@ public class OfflinePageUtilsTest extends ChromeActivityTestCaseBase<ChromeActiv
         mockSnackbarController.waitForSnackbarControllerToFinish();
 
         // Assert snackbar was shown.
-        Log.d(TAG, "last button = " + mockSnackbarController.getLastButtonType());
+        Log.d(TAG, "last tab id = " + mockSnackbarController.getLastTabId());
         Log.d(TAG, "dismissed = " + mockSnackbarController.getDismissed());
-        assertEquals(OfflinePageUtils.RELOAD_BUTTON, mockSnackbarController.getLastButtonType());
+        assertEquals(tabId, mockSnackbarController.getLastTabId());
         assertTrue(mockSnackbarController.getDismissed());
     }