Update WebAPKs even if the WebAPK start URL has no Web Manifest part 1/3

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java
index 79abb5964e34dc615dfe11ee40ed165a002dc59f..04ae09313e394e69a78de3707e9d91216e9e756c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Context;
-import android.os.Bundle;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
@@ -17,7 +16,6 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.chrome.test.util.browser.WebappTestPage;
 import org.chromium.content_public.common.ScreenOrientationValues;
 import org.chromium.net.test.EmbeddedTestServer;
-import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
 
 /**
  * Tests ManifestUpgradeDetector. This class contains tests which cannot be done as JUnit tests.
@@ -34,7 +32,7 @@ public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
     private static final String WEBAPK_NAME = "Manifest test app";
     private static final String WEBAPK_SHORT_NAME = "Manifest test app";
     private static final String WEBAPK_ICON_URL = "/chrome/test/data/banners/image-512px.png";
-    private static final long WEBAPK_ICON_MURMUR2_HASH = 6537363487080720023L;
+    private static final String WEBAPK_ICON_MURMUR2_HASH = "6537363487080720023";
     private static final int WEBAPK_DISPLAY_MODE = WebDisplayMode.Standalone;
     private static final int WEBAPK_ORIENTATION = ScreenOrientationValues.LANDSCAPE;
     private static final long WEBAPK_THEME_COLOR = 2147483648L;
@@ -51,7 +49,10 @@ public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
         private boolean mNeedsUpgrade;
 
         @Override
-        public void onUpgradeNeededCheckFinished(
+        public void onFinishedFetchingWebManifestForInitialUrl(
+                boolean needsUpgrade, ManifestUpgradeDetector.FetchedManifestData data) {}
+
+        public void onGotManifestData(
                 boolean needsUpgrade, ManifestUpgradeDetector.FetchedManifestData data) {
             mName = data.name;
             mNeedsUpgrade = needsUpgrade;
@@ -67,30 +68,20 @@ public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
         }
     }
 
-    private static class CreationData {
-        public CreationData(EmbeddedTestServer server) {
-            startUrl = server.getURL(WEBAPK_START_URL);
-            scopeUrl = server.getURL(WEBAPK_SCOPE_URL);
-            name = WEBAPK_NAME;
-            shortName = WEBAPK_SHORT_NAME;
-            iconUrl = server.getURL(WEBAPK_ICON_URL);
-            iconMurmur2Hash = WEBAPK_ICON_MURMUR2_HASH;
-            displayMode = WEBAPK_DISPLAY_MODE;
-            orientation = WEBAPK_ORIENTATION;
-            themeColor = WEBAPK_THEME_COLOR;
-            backgroundColor = WEBAPK_BACKGROUND_COLOR;
-        }
-
-        public String startUrl;
-        public String scopeUrl;
-        public String name;
-        public String shortName;
-        public String iconUrl;
-        public long iconMurmur2Hash;
-        public int displayMode;
-        public int orientation;
-        public long themeColor;
-        public long backgroundColor;
+    public WebApkMetaData defaultWebApkMetaData(EmbeddedTestServer server) {
+        WebApkMetaData metaData = new WebApkMetaData();
+        metaData.manifestUrl = mTestServer.getURL(WEBAPK_MANIFEST_URL);
+        metaData.startUrl = server.getURL(WEBAPK_START_URL);
+        metaData.scope = server.getURL(WEBAPK_SCOPE_URL);
+        metaData.name = WEBAPK_NAME;
+        metaData.shortName = WEBAPK_SHORT_NAME;
+        metaData.iconUrl = server.getURL(WEBAPK_ICON_URL);
+        metaData.iconMurmur2Hash = WEBAPK_ICON_MURMUR2_HASH;
+        metaData.displayMode = WEBAPK_DISPLAY_MODE;
+        metaData.orientation = WEBAPK_ORIENTATION;
+        metaData.themeColor = WEBAPK_THEME_COLOR;
+        metaData.backgroundColor = WEBAPK_BACKGROUND_COLOR;
+        return metaData;
     }
 
     @Override
@@ -117,22 +108,9 @@ public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
      * Web Manifest and determined whether the WebAPK needs to be upgraded.
      */
     private void startManifestUpgradeDetector(
-            CreationData creationData, final ManifestUpgradeDetector.Callback callback) {
-        Bundle metadata = new Bundle();
-        metadata.putString(
-                WebApkMetaDataKeys.WEB_MANIFEST_URL, mTestServer.getURL(WEBAPK_MANIFEST_URL));
-        metadata.putString(WebApkMetaDataKeys.START_URL, creationData.startUrl);
-        metadata.putString(WebApkMetaDataKeys.ICON_URL, creationData.iconUrl);
-        metadata.putString(
-                WebApkMetaDataKeys.ICON_MURMUR2_HASH, creationData.iconMurmur2Hash + "L");
-        WebappInfo webappInfo = WebappInfo.create("", creationData.startUrl, creationData.scopeUrl,
-                null, creationData.name, creationData.shortName, creationData.displayMode,
-                creationData.orientation, 0, creationData.themeColor, creationData.backgroundColor,
-                false, null);
-
+            WebApkMetaData metaData, final ManifestUpgradeDetector.Callback callback) {
         final ManifestUpgradeDetector detector =
-                new ManifestUpgradeDetector(mTab, webappInfo, metadata, callback);
-
+                new ManifestUpgradeDetector(mTab, metaData, callback);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ -153,7 +131,7 @@ public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
         CallbackWaiter waiter = new CallbackWaiter();
 
         // URL canonicalization should replace "%74" with 't'.
-        CreationData creationData = new CreationData(mTestServer);
+        WebApkMetaData creationData = defaultWebApkMetaData(mTestServer);
         creationData.startUrl = mTestServer.getURL(
                 "/chrome/test/data/banners/manifest_%74est_page.html");
         startManifestUpgradeDetector(creationData, waiter);
@@ -175,7 +153,7 @@ public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
         CallbackWaiter waiter = new CallbackWaiter();
 
         // URL canonicalization should replace "%62" with 'b'.
-        CreationData creationData = new CreationData(mTestServer);
+        WebApkMetaData creationData = defaultWebApkMetaData(mTestServer);
         creationData.startUrl = mTestServer.getURL(
                 "/chrome/test/data/banners/manifest_%62est_page.html");
         startManifestUpgradeDetector(creationData, waiter);