Reland: Use metadata when launching WebAPKs.

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 b9b446e5c42e75e08fff1b2ea7b2b39699294ab6..9f23fd256ffd7afce87534397a707883d91e82ca 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
@@ -153,8 +153,8 @@ public class WebappInfoTest extends InstrumentationTestCase {
         WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT,
                 ShortcutSource.UNKNOWN, themeColor, backgroundColor, false, null);
-        assertEquals(info.themeColor(), themeColor);
-        assertEquals(info.backgroundColor(), backgroundColor);
+        assertEquals(themeColor, info.themeColor());
+        assertEquals(backgroundColor, info.backgroundColor());
     }
 
     @SmallTest
@@ -169,8 +169,8 @@ public class WebappInfoTest extends InstrumentationTestCase {
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 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);
+        assertEquals(ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, info.themeColor());
+        assertEquals(ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, info.backgroundColor());
     }
 
     @SmallTest
@@ -184,8 +184,8 @@ public class WebappInfoTest extends InstrumentationTestCase {
         intent.putExtra(ShortcutHelper.EXTRA_BACKGROUND_COLOR, backgroundColor);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(info.themeColor(), themeColor);
-        assertEquals(info.backgroundColor(), backgroundColor);
+        assertEquals(themeColor, info.themeColor());
+        assertEquals(backgroundColor, info.backgroundColor());
     }
 
     @SmallTest
@@ -318,6 +318,29 @@ public class WebappInfoTest extends InstrumentationTestCase {
         assertEquals(packageName, info.webApkPackageName());
     }
 
+    @SmallTest
+    @Feature({"Webapps"})
+    public void testUpdateThemeColorAndOrientation() {
+        long themeColor = 0xFF00FF00L;
+        int orientation = ScreenOrientationValues.DEFAULT;
+
+        Intent intent = createIntentWithUrlAndId();
+        intent.putExtra(ShortcutHelper.EXTRA_THEME_COLOR, themeColor);
+        intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, orientation);
+
+        WebappInfo info = WebappInfo.create(intent);
+        assertEquals(themeColor, info.themeColor());
+        assertEquals(orientation, info.orientation());
+
+        // Updates the theme color and orientation.
+        themeColor = 0xFF0000FFL;
+        orientation = ScreenOrientationValues.LANDSCAPE;
+        info.updateThemeColor(themeColor);
+        info.updateOrientation(orientation);
+        assertEquals(themeColor, info.themeColor());
+        assertEquals(orientation, info.orientation());
+    }
+
     /**
      * Creates intent with url and id. If the url or id are not set WebappInfo#create() returns
      * null.