Introduce scope in WebappInfo.

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 53f53809d1c77fab7752b955347bbbebcd540184..70c6fe48bf16b25250af4dee604eb64a1297f9e5 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
@@ -27,7 +27,7 @@ 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,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null, null);
@@ -42,7 +42,7 @@ 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,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null, null);
@@ -131,7 +131,7 @@ 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,
                 WebDisplayMode.Fullscreen, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null, null);
@@ -150,7 +150,7 @@ 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,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT,
                 ShortcutSource.UNKNOWN, themeColor, backgroundColor, false, null, null);
         assertEquals(themeColor, info.themeColor());
@@ -165,7 +165,7 @@ 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,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null, null);
@@ -190,6 +190,26 @@ public class WebappInfoTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"Webapps", "WebApk"})
+    public void testScopeIntentCreation() {
+        String scope = "https://www.foo.com";
+        Intent intent = createIntentWithUrlAndId();
+        intent.putExtra(ShortcutHelper.EXTRA_SCOPE, scope);
+        WebappInfo info = WebappInfo.create(intent);
+        assertEquals(scope, info.scopeUri().toString());
+    }
+
+    @SmallTest
+    @Feature({"Webapps", "WebApk"})
+    public void testIntentScopeFallback() {
+        String url = "https://www.foo.com/homepage.html";
+        Intent intent = createIntentWithUrlAndId();
+        intent.putExtra(ShortcutHelper.EXTRA_URL, url);
+        WebappInfo info = WebappInfo.create(intent);
+        assertEquals(ShortcutHelper.getScopeFromUrl(url), info.scopeUri().toString());
+    }
+
+    @SmallTest
+    @Feature({"Webapps", "WebApk"})
     public void testIntentDisplayMode() {
         {
             Intent intent = createIntentWithUrlAndId();