Revert of Fixes redirects to external apps when navigating from PWA.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkIntegrationTest.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 android.app.Activity;
 import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
 
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.ApplicationStatus;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.ScalableTimeout;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.DeferredStartupHandler;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.content.browser.test.NativeLibraryTestRule;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.webapk.lib.common.WebApkConstants;
 
 /** Integration tests for WebAPK feature. */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
         ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
 public class WebApkIntegrationTest {
     @Rule
     public final ChromeActivityTestRule<WebApkActivity> mActivityTestRule =
             new ChromeActivityTestRule<>(WebApkActivity.class);
 
     @Rule
     public final NativeLibraryTestRule mNativeLibraryTestRule = new NativeLibraryTestRule();
 
+    @Rule
+    public final TopActivityListener activityListener = new TopActivityListener();
+
     private static final long STARTUP_TIMEOUT = ScalableTimeout.scaleTimeout(10000);
 
     private EmbeddedTestServer mTestServer;
 
     public void startWebApkActivity(String webApkPackageName, final String startUrl)
             throws InterruptedException {
         Intent intent =
                 new Intent(InstrumentationRegistry.getTargetContext(), WebApkActivity.class);
         intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName);
         intent.putExtra(ShortcutHelper.EXTRA_URL, startUrl);
@@ skipping 58 matching lines @@
                 mTestServer.getURL("/chrome/test/data/android/test.html"));
         waitUntilSplashscreenHides();
 
         // We navigate outside origin and expect Custom Tab to open on top of WebApkActivity.
         mActivityTestRule.runJavaScriptCodeInCurrentTab(
                 "window.top.location = 'https://www.google.com/'");
 
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
-                Activity activity = ApplicationStatus.getLastTrackedFocusedActivity();
-                if (!(activity instanceof CustomTabActivity)) {
-                    return false;
-                }
-                CustomTabActivity customTab = (CustomTabActivity) activity;
-                return customTab.getActivityTab() != null
+                ChromeActivity activity = (ChromeActivity) activityListener.getMostRecentActivity();
+                return activity instanceof CustomTabActivity
+                        && activity.getActivityTab() != null
                         // Dropping the TLD as Google can redirect to a local site.
-                        && customTab.getActivityTab().getUrl().startsWith("https://www.google.");
+                        && activity.getActivityTab().getUrl().startsWith("https://www.google.");
             }
         });
     }
 
     /**
      * Test that on first launch:
      * - the "WebApk.LaunchInterval" histogram is not recorded (because there is no prevous launch
      *   to compute the interval from).
      * - the "last used" time is updated (to compute future "launch intervals").
      */
@@ skipping 38 matching lines @@
         CriteriaHelper.pollUiThread(new Criteria("Deferred startup never completed") {
             @Override
             public boolean isSatisfied() {
                 return DeferredStartupHandler.getInstance().isDeferredStartupCompleteForApp();
             }
         });
 
         Assert.assertEquals(1, RecordHistogram.getHistogramTotalCountForTesting(histogramName));
     }
 }