[Android] Move WebappScopePolicy out of ExternalNavigationHandler.java

This CL is another step toward the componentization of
ExternalNavigationHandler.java for sharing with WebLayer. It removes
the dependence that ExternalNavigationHandler.java currently has on
//chrome's WebappScopePolicy.java. This dependence is to assist in
determining whether the user is navigating within the context of an
installed PWA within which the intent should stay. At this point in
time, this is //chrome-level functionality. Hence, we abstract this
check through ExternalNavigationDelegate.

Bug: 1031465
Change-Id: I65869090553f2cf337db39cfbb9aaac6d341f7e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087678
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747175}

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.java

@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
 
 import org.chromium.base.PackageManagerUtils;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
-import org.chromium.chrome.browser.webapps.WebappScopePolicy;
 
 import java.util.List;
 
@@ -33,12 +32,10 @@ interface ExternalNavigationDelegate {
     boolean willChromeHandleIntent(Intent intent);
 
     /**
-     * If the current activity is a webapp, applies the webapp's scope policy and returns the
-     * result. Returns {@link WebappScopePolicy#NavigationDirective#NORMAL_BEHAVIOR} if the current
-     * activity is not a webapp.
+     * Returns whether the context in which the intent is occurring is a webapp in which the
+     * navigation should stay.
      */
-    @WebappScopePolicy.NavigationDirective
-    int applyWebappScopePolicyForUrl(String url);
+    boolean shouldStayInWebapp(ExternalNavigationParams params);
 
     /**
      * Returns the number of specialized intent handlers in {@params infos}. Specialized intent

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java

@@ -213,8 +213,13 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
         return willChromeHandleIntent(intent, false);
     }
 
-    @Override
-    public @WebappScopePolicy.NavigationDirective int applyWebappScopePolicyForUrl(String url) {
+    /**
+     * If the current activity is a webapp, applies the webapp's scope policy and returns the
+     * result. Returns {@link WebappScopePolicy#NavigationDirective#NORMAL_BEHAVIOR} if the current
+     * activity is not a webapp.
+     * Protected to allow subclasses to customize the logic.
+     */
+    protected @WebappScopePolicy.NavigationDirective int applyWebappScopePolicyForUrl(String url) {
         Context context = getAvailableContext();
         if (context instanceof WebappActivity) {
             WebappActivity webappActivity = (WebappActivity) context;
@@ -224,6 +229,18 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
         return WebappScopePolicy.NavigationDirective.NORMAL_BEHAVIOR;
     }
 
+    // http://crbug.com/647569 : Stay in a PWA window for a URL within the same scope.
+    @Override
+    public boolean shouldStayInWebapp(ExternalNavigationParams params) {
+        @WebappScopePolicy.NavigationDirective
+        int webappScopePolicyDirective = applyWebappScopePolicyForUrl(params.getUrl());
+        if (webappScopePolicyDirective
+                == WebappScopePolicy.NavigationDirective.IGNORE_EXTERNAL_INTENT_REQUESTS) {
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public int countSpecializedHandlers(List<ResolveInfo> infos) {
         return getSpecializedHandlersWithFilter(infos, null).size();

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java

@@ -30,7 +30,6 @@ import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
-import org.chromium.chrome.browser.webapps.WebappScopePolicy;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.external_intents.ExternalIntentsSwitches;
@@ -487,12 +486,8 @@ public class ExternalNavigationHandler {
         return false;
     }
 
-    // http://crbug.com/647569 : Stay in a PWA window for a URL within the same scope.
     private boolean shouldStayInWebapp(ExternalNavigationParams params) {
-        @WebappScopePolicy.NavigationDirective
-        int webappScopePolicyDirective = mDelegate.applyWebappScopePolicyForUrl(params.getUrl());
-        if (webappScopePolicyDirective
-                == WebappScopePolicy.NavigationDirective.IGNORE_EXTERNAL_INTENT_REQUESTS) {
+        if (mDelegate.shouldStayInWebapp(params)) {
             if (DEBUG) Log.i(TAG, "Stay in PWA window");
             return true;
         }

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java

@@ -1781,15 +1781,21 @@ public class ExternalNavigationHandlerTest {
         }
 
         @Override
-        public @WebappScopePolicy.NavigationDirective int applyWebappScopePolicyForUrl(String url) {
+        public boolean shouldStayInWebapp(ExternalNavigationParams params) {
+            @WebappScopePolicy.NavigationDirective
+            int webappScopePolicyDirective = WebappScopePolicy.NavigationDirective.NORMAL_BEHAVIOR;
+
             for (IntentActivity intentActivity : mIntentActivities) {
                 if (intentActivity.packageName().equals(mReferrerWebappPackageName)) {
                     WebappInfo info = newWebappInfoFromScope(intentActivity.urlPrefix());
-                    return WebappScopePolicy.applyPolicyForNavigationToUrl(
-                            intentActivity.webappScopePolicy(), info, url);
+                    webappScopePolicyDirective = WebappScopePolicy.applyPolicyForNavigationToUrl(
+                            intentActivity.webappScopePolicy(), info, params.getUrl());
+                    break;
                 }
             }
-            return WebappScopePolicy.NavigationDirective.NORMAL_BEHAVIOR;
+
+            return webappScopePolicyDirective
+                    == WebappScopePolicy.NavigationDirective.IGNORE_EXTERNAL_INTENT_REQUESTS;
         }
 
         @Override