webapps: utilize manifest theme colors

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 3320e4bc63787edfaba97295bea86edfe6cb3fda..329ec8e86db656abec9f70800f4cb73f7e1195be 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
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -26,7 +27,8 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String url = "about:blank";
 
         WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
-                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN);
+                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
+                ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
         assertNotNull(info);
     }
 
@@ -39,7 +41,8 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String url = "http://google.com";
 
         WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
-                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN);
+                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
+                ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
         assertNotNull(info);
     }
 
@@ -146,9 +149,79 @@ public class WebappInfoTest extends InstrumentationTestCase {
         String url = "http://money.cnn.com";
 
         WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
-                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN);
+                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
+                ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
         assertNotNull(info);
         assertEquals(ScreenOrientationValues.DEFAULT, info.orientation());
         assertEquals(ShortcutSource.UNKNOWN, info.source());
     }
+
+    @SmallTest
+    @Feature({"Webapps"})
+    public void testNormalThemeColor() {
+        String id = "webapp id";
+        String name = "longName";
+        String shortName = "name";
+        String url = "http://money.cnn.com";
+        long themeColor = 0xFF0000FF;
+
+        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
+                themeColor);
+        assertNotNull(info);
+        assertEquals(info.themeColor(), themeColor);
+    }
+
+    @SmallTest
+    @Feature({"Webapps"})
+    public void testInvalidThemeColor() {
+        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,
+                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
+                ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
+        assertNotNull(info);
+        assertEquals(info.themeColor(), ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
+    }
+
+    @SmallTest
+    @Feature({"Webapps"})
+    public void testThemeColorIntentCreation() {
+        String id = "webapp id";
+        String url = "http://money.cnn.com";
+
+        Intent intent = new Intent();
+        long themeColor = 0xFF0000FFL;
+        intent.putExtra(ShortcutHelper.EXTRA_THEME_COLOR, themeColor);
+        intent.putExtra(ShortcutHelper.EXTRA_ID, id);
+        intent.putExtra(ShortcutHelper.EXTRA_URL, url);
+
+        WebappInfo info = WebappInfo.create(intent);
+        assertNotNull(info);
+        assertEquals(info.themeColor(), themeColor);
+    }
+
+    @SmallTest
+    @Feature({"Webapps"})
+    public void testThemeColorWrittenToBundle() {
+        String id = "webapp id";
+        String name = "longName";
+        String shortName = "name";
+        String url = "http://money.cnn.com";
+        long themeColor = 0xFF0000FF;
+
+        WebappInfo info = WebappInfo.create(id, url, null, name, shortName,
+                ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
+                themeColor);
+
+        Bundle bundle = new Bundle();
+        info.writeToBundle(bundle);
+
+        long bundleColor = bundle.getLong(ShortcutHelper.EXTRA_THEME_COLOR,
+                ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
+        assertEquals(bundleColor, themeColor);
+    }
 }