Upstream: Launch WebApkActivity from WebAPK.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java
index b61974e4905f699c53923354e2bda5b723a518bd..8fe40a82549e34f1e0922b0c5df3f12ae3b21c40 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java
@@ -12,6 +12,7 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.ShortcutSource;
 import org.chromium.content_public.common.ScreenOrientationValues;
+import org.chromium.webapk.lib.common.WebApkConstants;
 
 /**
  * Tests the WebappInfo class's ability to parse various URLs.
@@ -25,10 +26,10 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String shortName = "name";
         String url = "about:blank";
 
-        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+        WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
+                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null);
         assertNotNull(info);
     }
 
@@ -40,10 +41,10 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String shortName = "name";
         String url = "http://google.com";
 
-        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+        WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
+                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null);
         assertNotNull(info);
     }
 
@@ -145,10 +146,10 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String shortName = "name";
         String url = "http://money.cnn.com";
 
-        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+        WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
+                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null);
         assertEquals(ScreenOrientationValues.DEFAULT, info.orientation());
         assertEquals(ShortcutSource.UNKNOWN, info.source());
     }
@@ -163,9 +164,9 @@ public class WebappInfoTest extends InstrumentationTestCase {
         long themeColor = 0xFF00FF00L;
         long backgroundColor = 0xFF0000FFL;
 
-        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+        WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
-                themeColor, backgroundColor, false);
+                themeColor, backgroundColor, false, null);
         assertEquals(info.themeColor(), themeColor);
         assertEquals(info.backgroundColor(), backgroundColor);
     }
@@ -178,10 +179,10 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String shortName = "name";
         String url = "http://money.cnn.com";
 
-        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+        WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
+                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null);
         assertEquals(info.themeColor(), ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING);
         assertEquals(info.backgroundColor(), ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING);
     }
@@ -260,4 +261,25 @@ public class WebappInfoTest extends InstrumentationTestCase {
             assertFalse(name, WebappInfo.create(intent).isIconGenerated());
         }
     }
+
+    @SmallTest
+    @Feature({"WebApk"})
+    public void testIntentScopeAndPackageName() {
+        String id = WebApkConstants.WEBAPK_ID_PREFIX + "id";
+        String name = "longName";
+        String url = "http://www.foo.com/homepage";
+        String scope = "https://www.foo.com";
+        String packageName = WebApkConstants.WEBAPK_PACKAGE_PREFIX + ".foo";
+
+        Intent intent = new Intent();
+        intent.putExtra(ShortcutHelper.EXTRA_ID, id);
+        intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
+        intent.putExtra(ShortcutHelper.EXTRA_URL, url);
+        intent.putExtra(ShortcutHelper.EXTRA_SCOPE, scope);
+        intent.putExtra(ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, packageName);
+
+        WebappInfo info = WebappInfo.create(intent);
+        assertEquals(scope, info.scope().toString());
+        assertEquals(packageName, info.packageName());
+    }
 }