Update WebAPKs even if the WebAPK start URL has no Web Manifest

chrome/android/junit/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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ skipping 246 matching lines @@
         // set by the intent version of {@link WebApkInfo#create()}.
         Intent intent = new Intent();
         intent.putExtra(ShortcutHelper.EXTRA_URL, "");
         intent.putExtra(
                 ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, WebApkTestHelper.WEBAPK_PACKAGE_NAME);
         WebApkInfo info = WebApkInfo.create(intent);
 
         updateManager.updateIfNeeded(null, info);
     }
 
-    private static void onGotUnchangedWebManifestForInitialUrl(WebApkUpdateManager updateManager) {
-        onFinishedFetchingWebManifestForInitialUrl(updateManager, defaultManifestData());
-    }
-
-    private static void onFinishedFetchingWebManifestForInitialUrl(
-            WebApkUpdateManager updateManager, ManifestData fetchedManifestData) {
-        String bestIconUrl = randomIconUrl(fetchedManifestData);
-        updateManager.onFinishedFetchingWebManifestForInitialUrl(
-                infoFromManifestData(fetchedManifestData), bestIconUrl);
+    private static void onGotUnchangedWebManifestData(WebApkUpdateManager updateManager) {
+        onGotManifestData(updateManager, defaultManifestData());
     }
 
     private static void onGotManifestData(WebApkUpdateManager updateManager,
             ManifestData fetchedManifestData) {
         String bestIconUrl = randomIconUrl(fetchedManifestData);
         updateManager.onGotManifestData(infoFromManifestData(fetchedManifestData), bestIconUrl);
     }
 
     private static String randomIconUrl(ManifestData fetchedManifestData) {
         if (fetchedManifestData == null || fetchedManifestData.iconUrlToMurmur2HashMap.isEmpty()) {
@@ skipping 17 matching lines @@
      * from the fetched Web Manifest.
      */
     private boolean checkUpdateNeededForFetchedManifest(
             ManifestData androidManifestData, ManifestData fetchedManifestData) {
         registerWebApk(androidManifestData, WebApkVersion.CURRENT_SHELL_APK_VERSION);
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
-        updateManager.onFinishedFetchingWebManifestForInitialUrl(
+        updateManager.onGotManifestData(
                 infoFromManifestData(fetchedManifestData), fetchedManifestData.bestIconUrl);
         return updateManager.updateRequested();
     }
 
     @Before
     public void setUp() {
         ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
         CommandLine.init(null);
         ChromeWebApkHost.initForTesting(true);
 
@@ skipping 75 matching lines @@
      */
     @Test
     public void testCheckOnNextLaunchIfClosePriorToFirstPageLoad() {
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
         {
             TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
             updateIfNeeded(updateManager);
             assertTrue(updateManager.updateCheckStarted());
         }
 
-        // Chrome is killed.
-        // {@link WebApkUpdateManager#onFinishedFetchingWebManifestForInitialUrl()} is never called.
+        // Chrome is killed. Neither
+        // {@link WebApkUpdateManager#onWebManifestForInitialUrlNotWebApkCompatible()} nor
+        // {@link WebApkUpdateManager#OnGotManifestData()} is called.
 
         {
             // Relaunching the WebAPK should do an is-update-needed check.
             TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
             updateIfNeeded(updateManager);
             assertTrue(updateManager.updateCheckStarted());
-            onGotUnchangedWebManifestForInitialUrl(updateManager);
+            onGotUnchangedWebManifestData(updateManager);
         }
 
         {
             // Relaunching the WebAPK should not do an is-update-needed-check.
             TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
             updateIfNeeded(updateManager);
             assertFalse(updateManager.updateCheckStarted());
         }
     }
 
     /**
      * Test that the completion time of the previous WebAPK update is not modified if:
      * - The previous WebAPK update succeeded.
      * AND
      * - A WebAPK update is not required.
      */
     @Test
     public void testUpdateNotNeeded() {
         long initialTime = mClock.currentTimeMillis();
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
-        onGotUnchangedWebManifestForInitialUrl(updateManager);
+        onGotUnchangedWebManifestData(updateManager);
         assertFalse(updateManager.updateRequested());
 
         WebappDataStorage storage = getStorage();
         assertTrue(storage.getDidLastWebApkUpdateRequestSucceed());
         assertEquals(initialTime, storage.getLastWebApkUpdateRequestCompletionTime());
     }
 
     /**
      * Test that the last WebAPK update is marked as having succeeded if:
      * - The previous WebAPK update failed.
      * AND
      * - A WebAPK update is no longer required.
      */
     @Test
     public void testMarkUpdateAsSucceededIfUpdateNoLongerNeeded() {
         WebappDataStorage storage = getStorage();
         storage.updateDidLastWebApkUpdateRequestSucceed(false);
         mClock.advance(WebApkUpdateManager.RETRY_UPDATE_DURATION);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
-        onGotUnchangedWebManifestForInitialUrl(updateManager);
+        onGotUnchangedWebManifestData(updateManager);
         assertFalse(updateManager.updateRequested());
 
         assertTrue(storage.getDidLastWebApkUpdateRequestSucceed());
         assertEquals(
                 mClock.currentTimeMillis(), storage.getLastWebApkUpdateRequestCompletionTime());
     }
 
     /**
      * Test that the WebAPK update is marked as having failed if Chrome is killed prior to the
      * WebAPK update completing.
      */
     @Test
     public void testMarkUpdateAsFailedIfClosePriorToUpdateCompleting() {
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
         ManifestData manifestData = defaultManifestData();
         manifestData.name = DIFFERENT_NAME;
-        onFinishedFetchingWebManifestForInitialUrl(updateManager, manifestData);
+        onGotManifestData(updateManager, manifestData);
         assertTrue(updateManager.updateRequested());
 
         // Chrome is killed. {@link WebApkUpdateManager#onBuiltWebApk} is never called.
 
         // Check {@link WebappDataStorage} state.
         WebappDataStorage storage = getStorage();
         assertFalse(storage.getDidLastWebApkUpdateRequestSucceed());
         assertEquals(
                 mClock.currentTimeMillis(), storage.getLastWebApkUpdateRequestCompletionTime());
     }
 
     /**
      * Test that an update with data from the WebAPK's Android manifest is done if:
      * - WebAPK's code is out of date
      * AND
      * - WebAPK's start_url does not refer to a Web Manifest.
      *
      * It is good to minimize the number of users with out of date WebAPKs. We try to keep WebAPKs
      * up to date even if the web developer has removed the Web Manifest from their site.
      */
     @Test
     public void testShellApkOutOfDateNoWebManifest() {
         registerWebApk(defaultManifestData(), WebApkVersion.CURRENT_SHELL_APK_VERSION - 1);
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
 
-        onFinishedFetchingWebManifestForInitialUrl(updateManager, null);
+        updateManager.onWebManifestForInitialUrlNotWebApkCompatible();
         assertTrue(updateManager.updateRequested());
         assertEquals(NAME, updateManager.requestedUpdateName());
 
         // Check that the {@link ManifestUpgradeDetector} has been destroyed. This prevents
-        // {@link #onFinishedFetchingWebManifestForInitialUrl()} and {@link #onGotManifestData()}
+        // {@link #onWebManifestForInitialUrlNotWebApkCompatible()} and {@link #onGotManifestData()}
         // from getting called.
         assertTrue(updateManager.destroyedFetcher());
     }
 
     /**
      * Test that an update with data from the fetched Web Manifest is done if the WebAPK's code is
      * out of date and the WebAPK's start_url refers to a Web Manifest.
      */
     @Test
     public void testShellApkOutOfDateStillHasWebManifest() {
         registerWebApk(defaultManifestData(), WebApkVersion.CURRENT_SHELL_APK_VERSION - 1);
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
 
-        onFinishedFetchingWebManifestForInitialUrl(updateManager, defaultManifestData());
+        onGotManifestData(updateManager, defaultManifestData());
         assertTrue(updateManager.updateRequested());
         assertEquals(NAME, updateManager.requestedUpdateName());
 
         assertTrue(updateManager.destroyedFetcher());
     }
 
     /**
      * Test that an update is requested if:
      * - start_url does not refer to a Web Manifest.
      * AND
      * - The user eventually navigates to a page pointing to a Web Manifest with the correct URL.
      * AND
      * - The Web Manifest has changed.
      *
      * This scenario can occur if the WebAPK's start_url is a Javascript redirect.
      */
     @Test
     public void testStartUrlRedirectsToPageWithUpdatedWebManifest() {
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
         assertTrue(updateManager.updateCheckStarted());
 
         // start_url does not have a Web Manifest. No update should be requested.
-        onFinishedFetchingWebManifestForInitialUrl(updateManager, null);
+        updateManager.onWebManifestForInitialUrlNotWebApkCompatible();
         assertFalse(updateManager.updateRequested());
         // {@link ManifestUpgradeDetector} should still be alive so that it can get
         // {@link #onGotManifestData} when page with the Web Manifest finishes loading.
         assertFalse(updateManager.destroyedFetcher());
 
         // start_url redirects to page with Web Manifest.
 
         ManifestData manifestData = defaultManifestData();
         manifestData.name = DIFFERENT_NAME;
         onGotManifestData(updateManager, manifestData);
@@ skipping 10 matching lines @@
      * - The user eventually navigates to a page pointing to a Web Manifest with the correct URL.
      * AND
      * - The Web Manifest has not changed.
      */
     @Test
     public void testStartUrlRedirectsToPageWithUnchangedWebManifest() {
         mClock.advance(WebApkUpdateManager.FULL_CHECK_UPDATE_INTERVAL);
 
         TestWebApkUpdateManager updateManager = new TestWebApkUpdateManager(mClock);
         updateIfNeeded(updateManager);
-        onFinishedFetchingWebManifestForInitialUrl(updateManager, null);
+        updateManager.onWebManifestForInitialUrlNotWebApkCompatible();
         onGotManifestData(updateManager, defaultManifestData());
         assertFalse(updateManager.updateRequested());
 
         // We got the Web Manifest. The {@link ManifestUpgradeDetector} should be destroyed to stop
         // it from fetching the Web Manifest for subsequent page loads.
         assertTrue(updateManager.destroyedFetcher());
     }
 
     @Test
     public void testManifestDoesNotUpgrade() {
@@ skipping 99 matching lines @@
 
         ManifestData fetchedData = defaultManifestData();
         fetchedData.bestIconUrl = iconUrl2;
         fetchedData.iconUrlToMurmur2HashMap.clear();
         fetchedData.iconUrlToMurmur2HashMap.put(iconUrl1, null);
         fetchedData.iconUrlToMurmur2HashMap.put(iconUrl2, hash2);
 
         assertFalse(checkUpdateNeededForFetchedManifest(oldData, fetchedData));
     }
 }