Revert of Redirecting off-origin navigations in PWAs to CCT.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

 // Copyright 2016 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.content.Intent;
 import android.os.Bundle;
 import android.os.SystemClock;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
 import org.chromium.chrome.browser.metrics.WebApkUma;
 import org.chromium.chrome.browser.tab.BrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.tab.InterceptNavigationDelegateImpl;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
-import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.components.navigation_interception.NavigationParams;
 import org.chromium.webapk.lib.client.WebApkServiceConnectionManager;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * An Activity is designed for WebAPKs (native Android apps) and displays a webapp in a nearly
  * UI-less Chrome.
  */
 public class WebApkActivity extends WebappActivity {
@@ skipping 18 matching lines @@
     protected void initializeUI(Bundle savedInstance) {
         super.initializeUI(savedInstance);
         getActivityTab().setWebappManifestScope(mWebappInfo.scopeUri().toString());
     }
 
     @Override
     protected TabDelegateFactory createTabDelegateFactory() {
         return new WebappDelegateFactory(this) {
             @Override
             public InterceptNavigationDelegateImpl createInterceptNavigationDelegate(Tab tab) {
-                return new WebappInterceptNavigationDelegate(WebApkActivity.this, tab) {
+                return new InterceptNavigationDelegateImpl(tab) {
                     @Override
                     public ExternalNavigationParams.Builder buildExternalNavigationParams(
                             NavigationParams navigationParams,
                             TabRedirectHandler tabRedirectHandler, boolean shouldCloseTab) {
                         ExternalNavigationParams.Builder builder =
                                 super.buildExternalNavigationParams(
                                         navigationParams, tabRedirectHandler, shouldCloseTab);
                         builder.setWebApkPackageName(getWebApkPackageName());
                         return builder;
                     }
-
-                    @Override
-                    protected boolean isUrlOutsideWebappScope(WebappInfo info, String url) {
-                        return !UrlUtilities.isUrlWithinScope(url, info.scopeUri().toString());
-                    }
                 };
             }
 
             @Override
             public boolean canShowAppBanners(Tab tab) {
                 // Do not show app banners for WebAPKs regardless of the current page URL.
                 // A WebAPK can display a page outside of its WebAPK scope if a page within the
                 // WebAPK scope navigates via JavaScript while the WebAPK is in the background.
                 return false;
             }
@@ skipping 121 matching lines @@
     }
 
     @Override
     protected void onDestroyInternal() {
         if (mUpdateManager != null) {
             mUpdateManager.destroy();
         }
         super.onDestroyInternal();
     }
 }