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

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.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.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ skipping 81 matching lines @@
     private static final String WEBAPK_WITH_NATIVE_APP_SCOPE =
             "https://www.webapk.with.native.com";
     private static final String WEBAPK_WITH_NATIVE_APP_PACKAGE_NAME =
             "org.chromium.webapk.with.native";
     private static final String NATIVE_APP_PACKAGE_NAME = "com.webapk.with.native.android";
 
     private static final String COUNTERFEIT_WEBAPK_SCOPE = "http://www.counterfeit.webapk.com";
     private static final String COUNTERFEIT_WEBAPK_PACKAGE_NAME =
             "org.chromium.webapk.counterfeit";
 
+    private static final String[] SUPERVISOR_START_ACTIONS = {

[Ted C, 2017/03/01 16:55:51]

I've vote to make the other ones public and marked @VisibleForTesting instead of
copying them here.

[Maria, 2017/03/01 17:43:39]

That's what I did in patch 1. Turns out it's a findbugs error to have a public
static final mutable container (array). That's why I copied them here. The error
didn't show up before because they were package protected and findbugs only
complains about public exposure.

+            "com.google.android.instantapps.START", "com.google.android.instantapps.nmr1.INSTALL",
+            "com.google.android.instantapps.nmr1.VIEW"};
+
     private final TestExternalNavigationDelegate mDelegate;
     private ExternalNavigationHandler mUrlHandler;
 
     public ExternalNavigationHandlerTest() {
         mDelegate = new TestExternalNavigationDelegate();
         mUrlHandler = new ExternalNavigationHandler(mDelegate);
     }
 
     @Override
     protected void setUp() throws Exception {
@@ skipping 504 matching lines @@
                 + "S.com.google.android.gms.instantapps.IS_GOOGLE_SEARCH_REFERRER="
                 + "true;S.android.intent.extra.REFERRER_NAME="
                 + "https%3A%2F%2Fwww.google.com;end";
         checkUrl(nonSupervisor)
                 .expecting(OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT,
                         START_OTHER_ACTIVITY);
         assertFalse(mDelegate.startActivityIntent.hasExtra(
                 InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER));
 
         // Check that Supervisor is detected by action even without package
-        for (String action : ExternalNavigationHandler.SUPERVISOR_START_ACTIONS) {
+        for (String action : SUPERVISOR_START_ACTIONS) {
             String intentWithoutPackage = "intent://buzzfeed.com/tasty#Intent;scheme=http;"
                     + "action=" + action + ";"
                     + "S.com.google.android.instantapps.FALLBACK_PACKAGE="
                     + "com.android.chrome;S.com.google.android.instantapps.INSTANT_APP_PACKAGE="
                     + "com.yelp.android;S.android.intent.extra.REFERRER_NAME="
                     + "https%3A%2F%2Fwww.google.com;end";
             mDelegate.setIsSerpReferrer(false);
             checkUrl(intentWithoutPackage)
                     .expecting(OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
         }
@@ skipping 933 matching lines @@
             return new TestPackageManager();
         }
 
         @Override
         public String getPackageName() {
             return "test.app.name";
         }
 
     }
 }