Instant Apps: refactor logic to encapsulate in the Instant Apps Handler.

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

 // Copyright 2015 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.externalnav;
 
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ skipping 41 matching lines @@
     private static final String SMS_SCHEME = "sms";
 
     private static final String PLAY_PACKAGE_PARAM = "id";
     private static final String PLAY_REFERRER_PARAM = "referrer";
     private static final String PLAY_APP_PATH = "/store/apps/details";
     private static final String PLAY_HOSTNAME = "play.google.com";
 
     @VisibleForTesting
     static final String EXTRA_BROWSER_FALLBACK_URL = "browser_fallback_url";
 
-    @VisibleForTesting
-    static final String SUPERVISOR_PKG = "com.google.android.instantapps.supervisor";
-    @VisibleForTesting
-    static final String[] SUPERVISOR_START_ACTIONS = {
-            "com.google.android.instantapps.START",
-            "com.google.android.instantapps.nmr1.INSTALL",
-            "com.google.android.instantapps.nmr1.VIEW" };
-
     // An extra that may be specified on an intent:// URL that contains an encoded value for the
     // referrer field passed to the market:// URL in the case where the app is not present.
     @VisibleForTesting
     static final String EXTRA_MARKET_REFERRER = "market_referrer";
 
     private final ExternalNavigationDelegate mDelegate;
 
     /**
      * Result types for checking if we should override URL loading.
      * NOTE: this enum is used in UMA, do not reorder values. Changes should be append only.
@@ skipping 383 matching lines @@
                     if (previousIntent != null
                             && resolversSubsetOf(resolvingInfos,
                                     mDelegate.queryIntentActivities(previousIntent))) {
                         if (DEBUG) Log.i(TAG, "NO_OVERRIDE: Same host, no new resolvers");
                         return OverrideUrlLoadingResult.NO_OVERRIDE;
                     }
                 }
             }
         }
 
-        boolean isDirectInstantAppsIntent = isExternalProtocol && isIntentToInstantApp(intent);
+        boolean isDirectInstantAppsIntent =
+                isExternalProtocol && InstantAppsHandler.isIntentToInstantApp(intent);
         boolean shouldProxyForInstantApps = isDirectInstantAppsIntent
                 && mDelegate.isSerpReferrer(params.getTab());
         if (shouldProxyForInstantApps) {
             intent.putExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER, true);
         } else if (isDirectInstantAppsIntent) {
             // For security reasons, we disable all intent:// URLs to Instant Apps that are
             // not coming from SERP.
             if (DEBUG) Log.i(TAG, "NO_OVERRIDE: Intent URL to an Instant App");
             return OverrideUrlLoadingResult.NO_OVERRIDE;
         } else {
@@ skipping 102 matching lines @@
                 return OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT;
             }
         } catch (ActivityNotFoundException ex) {
             // ignore the error on devices that does not have Play Store installed.
             if (DEBUG) Log.i(TAG, "NO_OVERRIDE: Play Store not installed");
             return OverrideUrlLoadingResult.NO_OVERRIDE;
         }
     }
 
     /**
-     * Checks whether {@param intent} is for an Instant App. Considers both package and actions that
-     * would resolve to Supervisor.
-     * @return Whether the given intent is going to open an Instant App.
-     */
-    private boolean isIntentToInstantApp(Intent intent) {
-        if (SUPERVISOR_PKG.equals(intent.getPackage())) return true;
-
-        String intentAction = intent.getAction();
-        for (String action: SUPERVISOR_START_ACTIONS) {
-            if (action.equals(intentAction)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
      * Clobber the current tab with fallback URL.
      *
      * @param browserFallbackUrl The fallback URL.
      * @param params The external navigation params.
      * @return {@link OverrideUrlLoadingResult} if the tab was clobbered, or we launched an
      *         intent.
      */
     private OverrideUrlLoadingResult clobberCurrentTabWithFallbackUrl(
             String browserFallbackUrl, ExternalNavigationParams params) {
         // If the fallback URL is a link to Play Store, send the user to Play Store app
@@ skipping 68 matching lines @@
         if (defaultSmsPackageName == null) return null;
         // Makes sure that the default SMS app actually resolves the intent.
         for (ResolveInfo resolveInfo : resolvingComponentNames) {
             if (defaultSmsPackageName.equals(resolveInfo.activityInfo.packageName)) {
                 return defaultSmsPackageName;
             }
         }
         return null;
     }
 }