[Android] Enable WebAPK to have multiple intent filters

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.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.content.res.AssetManager;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ skipping 160 matching lines @@
 
         WebApkInfo info = WebApkInfo.create(intent);
         Assert.assertEquals(intentStartUrl, info.uri().toString());
 
         // {@link WebApkInfo#manifestStartUrl()} should contain the start URL from the Android
         // Manifest.
         Assert.assertEquals(START_URL, info.manifestStartUrl());
     }
 
     /**
+     * Test that {@link WebApkInfo#create()} rewrites {@link WebApkInfo#uri()} when the start URL
+     * from the intent is outside of the scope in the WebAPK Android Manifest.
+     */
+    @Test
+    public void testRewriteStartUrlSchemeAndHost() {
+        final String intentStartUrl = "http://www.google.ca/search_results?q=eh#cr=countryCA";
+        final String expectedRewrittenStartUrl =
+                "https://www.google.com/search_results?q=eh#cr=countryCA";
+        final String manifestStartUrl = "https://www.google.com/";
+        final String manifestScope = "https://www.google.com/";
+
+        Bundle bundle = new Bundle();
+        bundle.putString(WebApkMetaDataKeys.START_URL, manifestStartUrl);
+        bundle.putString(WebApkMetaDataKeys.SCOPE, manifestScope);
+        WebApkTestHelper.registerWebApkWithMetaData(WEBAPK_PACKAGE_NAME, bundle);
+
+        Intent intent = new Intent();
+        intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, WEBAPK_PACKAGE_NAME);
+        intent.putExtra(ShortcutHelper.EXTRA_URL, intentStartUrl);
+
+        WebApkInfo info = WebApkInfo.create(intent);
+
+        Assert.assertEquals(expectedRewrittenStartUrl, info.uri().toString());
+        Assert.assertEquals(manifestStartUrl, info.manifestStartUrl());
+    }
+
+    /**
      * Test that if the scope is empty that the scope is computed from the "start URL specified from
      * the Web Manifest" not the "URL the WebAPK initially navigated to". Deep links can open a
      * WebAPK at an arbitrary URL.
      */
     @Test
     public void testDefaultScopeFromManifestStartUrl() {
         String manifestStartUrl = START_URL;
         String intentStartUrl = "https://www.google.com/a/b/c";
 
         String scopeFromManifestStartUrl = ShortcutHelper.getScopeFromUrl(manifestStartUrl);
@@ skipping 147 matching lines @@
 
         Intent intent = new Intent();
         intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, WEBAPK_PACKAGE_NAME);
         intent.putExtra(ShortcutHelper.EXTRA_URL, START_URL);
 
         WebApkInfo info = WebApkInfo.create(intent);
         Assert.assertEquals(name, info.name());
         Assert.assertEquals(shortName, info.shortName());
     }
 }