Upstream: Add URL intent filter to WebAPK

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java

Index: chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
index 386c216bb612f370d908953944adb5111c035ca1..4557fa9ff49471051d4d17a7a82cb921d812ffc4 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/MainActivity.java
@@ -54,6 +54,13 @@ public class MainActivity extends Activity {
                     packageName, PackageManager.GET_META_DATA);
             Bundle bundle = appInfo.metaData;
             url = bundle.getString(META_DATA_HOST_URL);
+
+            String overrideUrl = getIntent().getDataString();
+            // TODO(pkotwicz): Use same logic as {@code IntentHandler#shouldIgnoreIntent()}
+            if (overrideUrl != null && overrideUrl.startsWith("https:")) {
+                url = overrideUrl;
+            }
+
             scope = bundle.getString(META_DATA_SCOPE);
             webappId = WebApkConstants.WEBAPK_ID_PREFIX + packageName;
             mac = bundle.getString(META_DATA_MAC);
@@ -95,4 +102,13 @@ public class MainActivity extends Activity {
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, output);
         return Base64.encodeToString(output.toByteArray(), Base64.DEFAULT);
     }
+
+    /**
+     * Returns whether a url is valid.
+     * @param url The url to check.
+     * @return Whether the url is valid.
+     */
+    private static boolean isUrlValid(String url) {

[Yaron, 2016/05/12 13:45:12]

nit: remove

+        return url != null && url.startsWith("https:");
+    }
 }