Upstream: Launch WebApkActivity from WebAPK.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.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.webapps;
 
 import android.content.Intent;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 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.
  */
 public class WebappInfoTest extends InstrumentationTestCase {
     @SmallTest
     @Feature({"Webapps"})
     public void testAbout() {
         String id = "webapp id";
         String name = "longName";
         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);
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testRandomUrl() {
         String id = "webapp id";
         String name = "longName";
         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);
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testSpacesInUrl() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String bustedUrl = "http://money.cnn.com/?category=Latest News";
@@ skipping 81 matching lines @@
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testOrientationAndSource() {
         String id = "webapp id";
         String name = "longName";
         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());
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testNormalColors() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "http://money.cnn.com";
         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);
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testInvalidOrMissingColors() {
         String id = "webapp id";
         String name = "longName";
         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);
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testColorsIntentCreation() {
         String id = "webapp id";
         String url = "http://money.cnn.com";
         long themeColor = 0xFF00FF00L;
@@ skipping 58 matching lines @@
             Intent intent = new Intent();
             intent.putExtra(ShortcutHelper.EXTRA_ID, id);
             intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
             intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
             intent.putExtra(ShortcutHelper.EXTRA_URL, url);
             intent.putExtra(ShortcutHelper.EXTRA_IS_ICON_GENERATED, "true");
 
             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());
+    }
 }