[WebApks] Tweak logic for 'bouncing back to chrome'

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
index 395a2b82d047efc359cea34964835ed99d066548..69394748bbf43d514f80a325db90c02126782e6b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
@@ -930,7 +930,6 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
     public void testLaunchWebApk_StayInSameWebApk() {
         CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_WEBAPK);
         checkUrl(WEBAPK_SCOPE + "/new.html")
-                .withReferrer(WEBAPK_SCOPE)

[Yaron, 2016/08/09 17:55:04]

without my change in the app, removing this would cause
OVERRIDE_WITH_EXTERNAL_INTENT which I think was the wrong behaviour. Regardless
of the referer, if we are in webapk and the url targets a webapk, there should
be no override.

                 .withWebApkPackageName(WEBAPK_PACKAGE_NAME)
                 .expecting(OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
     }
@@ -953,7 +952,7 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
 
         @Override
         public List<ResolveInfo> queryIntentActivities(Intent intent) {
-            List<ResolveInfo> list = new ArrayList<ResolveInfo>();
+            List<ResolveInfo> list = new ArrayList<>();
             // TODO(yfriedman): We shouldn't have a separate global override just for tests - we
             // should mimic the appropriate intent resolution intead.
             if (mQueryIntentOverride != null) {
@@ -1284,7 +1283,7 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
     private static class TestPackageManager extends MockPackageManager {
         @Override
         public List<ResolveInfo> queryIntentActivities(Intent intent, int flags) {
-            List<ResolveInfo> resolves = new ArrayList<ResolveInfo>();
+            List<ResolveInfo> resolves = new ArrayList<>();
             if (intent.getDataString().startsWith("market:")) {
                 resolves.add(newResolveInfo("market", "market"));
             } else if (intent.getDataString().startsWith("http://m.youtube.com")