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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Context;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CallbackHelper;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.blink_public.platform.WebDisplayMode;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
 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.client.WebApkVersion;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Tests ManifestUpgradeDetector. This class contains tests which cannot be done as JUnit tests.
+ * Tests WebApkUpdateManager. This class contains tests which cannot be done as JUnit tests.
  */
-public class ManifestUpgradeDetectorTest extends ChromeTabbedActivityTestBase {
+@CommandLineFlags.Add(ChromeSwitches.CHECK_FOR_WEB_MANIFEST_UPDATE_ON_STARTUP)
+public class WebApkUpdateManagerTest extends ChromeTabbedActivityTestBase {
 
+    private static final String WEBAPK_PACKAGE = "test.package";
+    private static final String WEBAPK_ID = "webapk_id";
     private static final String WEBAPK_MANIFEST_URL =
             "/chrome/test/data/banners/manifest_one_icon.json";
 
     // Data contained in {@link WEBAPK_MANIFEST_URL}.
     private static final String WEBAPK_START_URL =
             "/chrome/test/data/banners/manifest_test_page.html";
     private static final String WEBAPK_SCOPE_URL = "/chrome/test/data/banners/";
     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 String WEBAPK_ICON_MURMUR2_HASH = "7742433188808797392";
     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;
     private static final long WEBAPK_BACKGROUND_COLOR = 2147483648L;
 
     private EmbeddedTestServer mTestServer;
     private Tab mTab;
 
-    // CallbackHelper which blocks until the {@link ManifestUpgradeDetector.Callback} callback is
-    // called.
-    private static class CallbackWaiter
-            extends CallbackHelper implements ManifestUpgradeDetector.Callback {
-        private String mName;
-        private boolean mNeedsUpgrade;
+    /**
+     * Subclass of {@link WebApkUpdateManager} which notifies the {@link CallbackHelper} passed to
+     * the constructor when it has been determined whether an update is needed.
+     */
+    private static class TestWebApkUpdateManager extends WebApkUpdateManager {
+        private CallbackHelper mWaiter;
+        private boolean mNeedsUpdate = false;
+
+        public TestWebApkUpdateManager(CallbackHelper waiter) {
+            mWaiter = waiter;
+        }
 
         @Override
         public void onFinishedFetchingWebManifestForInitialUrl(
-                boolean needsUpgrade, WebApkInfo info, String bestIconUrl) {}
-
-        public void onGotManifestData(boolean needsUpgrade, WebApkInfo info, String bestIconUrl) {
-            mName = info.name();
-            mNeedsUpgrade = needsUpgrade;
-            notifyCalled();
+                WebApkInfo fetchedInfo, String bestIconUrl) {
+            super.onFinishedFetchingWebManifestForInitialUrl(fetchedInfo, bestIconUrl);
+            mWaiter.notifyCalled();
         }
 
-        public String name() {
-            return mName;
+        @Override
+        public void onGotManifestData(WebApkInfo fetchedInfo, String bestIconUrl) {
+            super.onGotManifestData(fetchedInfo, bestIconUrl);
+            mWaiter.notifyCalled();
         }
 
-        public boolean needsUpgrade() {
-            return mNeedsUpgrade;
+        @Override
+        protected void updateAsync(WebApkInfo fetchedInfo, String bestIconUrl) {
+            mNeedsUpdate = true;
+        }
+
+        public boolean needsUpdate() {
+            return mNeedsUpdate;
         }
     }
 
     private static class CreationData {
         public String manifestUrl;
         public String startUrl;
         public String scope;
         public String name;
         public String shortName;
         public Map<String, String> iconUrlToMurmur2HashMap;
@@ skipping 21 matching lines @@
         creationData.backgroundColor = WEBAPK_BACKGROUND_COLOR;
         return creationData;
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         Context context = getInstrumentation().getTargetContext();
         mTestServer = EmbeddedTestServer.createAndStartServer(context);
         mTab = getActivity().getActivityTab();
+
+        TestFetchStorageCallback callback = new TestFetchStorageCallback();
+        WebappRegistry.getInstance().register(WEBAPK_ID, callback);
+        callback.waitForCallback(0);
     }
 
     @Override
     protected void tearDown() throws Exception {
         mTestServer.stopAndDestroyServer();
         super.tearDown();
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 
-    /**
-     * Starts a ManifestUpgradeDetector. Calls {@link callback} once the detector has fetched the
-     * Web Manifest and determined whether the WebAPK needs to be upgraded.
-     */
-    private void startManifestUpgradeDetector(
-            CreationData creationData, final ManifestUpgradeDetector.Callback callback) {
-        WebApkInfo info = WebApkInfo.create("", "", creationData.scope, null, creationData.name,
-                creationData.shortName, creationData.displayMode, creationData.orientation, 0,
-                creationData.themeColor, creationData.backgroundColor, "", 0,
-                creationData.manifestUrl, creationData.startUrl,
-                creationData.iconUrlToMurmur2HashMap);
-        final ManifestUpgradeDetector detector = new ManifestUpgradeDetector(mTab, info, callback);
+     /** Checks whether a WebAPK update is needed. */
+    private boolean checkUpdateNeeded(final CreationData creationData) throws Exception {
+        CallbackHelper waiter = new CallbackHelper();
+        final TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(waiter);
+
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                detector.start();
+                WebApkInfo info = WebApkInfo.create(WEBAPK_ID, "", creationData.scope, null,
+                        creationData.name, creationData.shortName, creationData.displayMode,
+                        creationData.orientation, 0, creationData.themeColor,
+                        creationData.backgroundColor, "", WebApkVersion.CURRENT_SHELL_APK_VERSION,
+                        creationData.manifestUrl, creationData.startUrl,
+                        creationData.iconUrlToMurmur2HashMap);
+                updateManager.updateIfNeeded(mTab, info);
             }
         });
+        waiter.waitForCallback(0);
+
+        return updateManager.needsUpdate();
     }
 
     /**
      * Test that the canonicalized URLs are used in determining whether the fetched Web Manifest
      * data differs from the metadata in the WebAPK's Android Manifest. This is important because
      * the URLs in the Web Manifest have been modified by the WebAPK server prior to being stored in
      * the WebAPK Android Manifest. Chrome and the WebAPK server parse URLs differently.
      */
     @MediumTest
     @Feature({"WebApk"})
     public void testCanonicalUrlsIdenticalShouldNotUpgrade() throws Exception {
-        CallbackWaiter waiter = new CallbackWaiter();
-
         // URL canonicalization should replace "%74" with 't'.
         CreationData creationData = defaultCreationData(mTestServer);
         creationData.startUrl = mTestServer.getURL(
                 "/chrome/test/data/banners/manifest_%74est_page.html");
-        startManifestUpgradeDetector(creationData, waiter);
 
         WebappTestPage.navigateToPageWithServiceWorkerAndManifest(
                 mTestServer, mTab, WEBAPK_MANIFEST_URL);
-        waiter.waitForCallback(0);
-
-        assertEquals(WEBAPK_NAME, waiter.name());
-        assertFalse(waiter.needsUpgrade());
+        assertFalse(checkUpdateNeeded(creationData));
     }
 
     /**
      * Test that an upgraded WebAPK is requested if the canonicalized "start URLs" are different.
      */
     @MediumTest
     @Feature({"WebApk"})
     public void testCanonicalUrlsDifferentShouldUpgrade() throws Exception {
-        CallbackWaiter waiter = new CallbackWaiter();
-
         // URL canonicalization should replace "%62" with 'b'.
         CreationData creationData = defaultCreationData(mTestServer);
         creationData.startUrl = mTestServer.getURL(
                 "/chrome/test/data/banners/manifest_%62est_page.html");
-        startManifestUpgradeDetector(creationData, waiter);
 
         WebappTestPage.navigateToPageWithServiceWorkerAndManifest(
                 mTestServer, mTab, WEBAPK_MANIFEST_URL);
-        waiter.waitForCallback(0);
-
-        assertEquals(WEBAPK_NAME, waiter.name());
-        assertTrue(waiter.needsUpgrade());
+        assertTrue(checkUpdateNeeded(creationData));
     }
 }