Redirecting off-origin navigations in PWAs to CCT.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java
index 9cf3a8270df2f7b84f047c8235762b9c24af0249..d0e3c92c452e9d9049db0c77bd456af7e8d16322 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java
@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.view.ViewGroup;
 
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
@@ -107,15 +108,22 @@ public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<
     }
 
     /**
-     * Waits until any loads in progress have completed.
+     * Waits until any loads in progress of the activity under test have completed.
      */
     protected void waitUntilIdle() {
+        waitUntilIdle(getActivity());
+    }
+
+    /**
+     * Waits until any loads in progress of a selected activity have completed.
+     */
+    protected void waitUntilIdle(final ChromeActivity activity) {
         getInstrumentation().waitForIdleSync();
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
-                    return getActivity().getActivityTab() != null
-                            && !getActivity().getActivityTab().isLoading();
+                    return activity.getActivityTab() != null
+                            && !activity.getActivityTab().isLoading();
                 }
             }, STARTUP_TIMEOUT, CriteriaHelper.DEFAULT_POLLING_INTERVAL);