Send all of the icon URLs listed in Web Manifest to WebAPK Server.

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java
index 9e528769bc44e50a02879c6a767e6e82ed971f02..362a23d03d1a716d844dd1d1a872b08f1c498d4d 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java
@@ -13,10 +13,15 @@ import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import org.chromium.base.CollectionUtil;
 import org.chromium.base.ContextUtils;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
+import org.chromium.webapk.lib.common.WebApkConstants;
 import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
 
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Tests WebApkMetaDataUtils.
  */
@@ -40,16 +45,48 @@ public class WebApkMetaDataUtilsTest {
     }
 
     /**
+     * Test that {@link WebApkMetaDataUtils.getIconUrlAndIconMurmur2HashMap} can read icon URLs and
+     * icon murmur2 hashes from metadata and returns a map with {icon URL, icon hash} pairs.
+     */

[pkotwicz, 2016/11/14 22:43:11]

Nit: "can read icon URLs and icon murmur2 hashes" -> "can read multiple icon
URLs and multiple icon Murmur2 hashes"

[Xi Han, 2016/11/15 20:07:08]

Done.

+    @Test
+    public void testGetIconUrlAndMurmur2HashFromMetaData() {
+        String iconUrl1 = "/icon1.png";
+        String iconUrl2 = "/icon2.png";
+        String hash1 = "1";
+        String hash2 = "2";
+        Set<String> iconUrlSet = CollectionUtil.newHashSet(iconUrl1, iconUrl2);
+
+        Bundle bundle = new Bundle();
+        String iconUrls = iconUrl1 + WebApkConstants.ICON_URL_SEPARATOR + iconUrl2;
+        String iconHashs = hash1 + "L" + WebApkConstants.ICON_HASH_SEPARATOR + hash2 + "L";
+        bundle.putString(WebApkMetaDataKeys.ICON_URLS, iconUrls);
+        bundle.putString(WebApkMetaDataKeys.ICON_MURMUR2_HASHES, iconHashs);
+        Map<String, String> iconUrlAndIconMurmur2HashMap =
+                WebApkMetaDataUtils.getIconUrlAndIconMurmur2HashMap(bundle);
+
+        Assert.assertEquals(iconUrlSet, iconUrlAndIconMurmur2HashMap.keySet());
+        Assert.assertEquals(hash1, iconUrlAndIconMurmur2HashMap.get(iconUrl1));
+        Assert.assertEquals(hash2, iconUrlAndIconMurmur2HashMap.get(iconUrl2));
+    }
+
+    /**
      * WebApkIconHasher generates hashes with values [0, 2^64-1]. 2^64-1 is greater than
-     * {@link Long#MAX_VALUE}. Test that {@link #getIconMurmur2HashFromMetaData()} can read a hash
+     * {@link Long#MAX_VALUE}. Test that {@link #getIconUrlAndIconMurmur2HashMap()} can read a hash
      * with value 2^64 - 1.
      */
     @Test
     public void testGetIconMurmur2HashFromMetaData() {
+        String iconUrl = "/icon1.png";
         String hash = "18446744073709551615"; // 2^64 - 1
+        Set<String> iconUrlSet = CollectionUtil.newHashSet(iconUrl);
+
         Bundle bundle = new Bundle();
-        bundle.putString(WebApkMetaDataKeys.ICON_MURMUR2_HASH, hash + "L");
-        String extractedHash = WebApkMetaDataUtils.getIconMurmur2HashFromMetaData(bundle);
-        Assert.assertEquals(hash, extractedHash);
+        bundle.putString(WebApkMetaDataKeys.ICON_URLS, iconUrl);
+        bundle.putString(WebApkMetaDataKeys.ICON_MURMUR2_HASHES, hash + "L");
+        Map<String, String> iconUrlAndIconMurmur2HashMap =
+                WebApkMetaDataUtils.getIconUrlAndIconMurmur2HashMap(bundle);
+
+        Assert.assertEquals(iconUrlSet, iconUrlAndIconMurmur2HashMap.keySet());

[pkotwicz, 2016/11/14 22:43:11]

I think that you can simplify things by doing this:
Assert.assertEquals(1, iconUrlAndIconMurmur2HashMap.size();
Assert.assertTrue(iconUrlAndIconMurmur2HashMap.containsKey(iconUrl));

That enables you to get rid of |iconUrlSet|

[Xi Han, 2016/11/15 20:07:08]

Done.

+        Assert.assertEquals(hash, iconUrlAndIconMurmur2HashMap.get(iconUrl));
     }
 }