Redirecting off-origin navigations in PWAs to CCT.

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.view.ViewGroup;
 
 import org.junit.Assert;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
 import org.chromium.base.test.util.UrlUtils;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 /**
  * Custom {@link ChromeActivityTestRule} for tests using {@link WebappActivity}.
  */
 public class WebappActivityTestRule extends ChromeActivityTestRule<WebappActivity0> {
     public static final String WEBAPP_ID = "webapp_id";
@@ skipping 81 matching lines @@
 
     /**
      * Starts up the WebappActivity with a specific Intent and sets up the test observer.
      */
     public final void startWebappActivity(Intent intent) throws Exception {
         launchActivity(intent);
         waitUntilIdle();
     }
 
     /**
-     * Waits until any loads in progress have completed.
+     * Waits until any loads in progress of the activity under test have completed.
      */
-    public void waitUntilIdle() {
+    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);
 
         getInstrumentation().waitForIdleSync();
     }
 
     /**
      * Waits for the splash screen to be hidden.
      */
     public void waitUntilSplashscreenHides() {
@@ skipping 13 matching lines @@
             }
         });
 
         ViewGroup splashScreen = getActivity().getSplashScreenForTests();
         if (splashScreen == null) {
             Assert.fail("No splash screen available.");
         }
         return splashScreen;
     }
 }