Use metadata when launching WebAPKs.

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

 // Copyright 2015 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.assertTrue;
 
 import android.content.Context;
@@ skipping 333 matching lines @@
 
         long actualLastUsed = webAppPrefs.getLong(WebappDataStorage.KEY_LAST_USED,
                 WebappDataStorage.LAST_USED_INVALID);
         assertEquals(WebappDataStorage.LAST_USED_INVALID, actualLastUsed);
 
         long lastCleanup = mSharedPreferences.getLong(WebappRegistry.KEY_LAST_CLEANUP, -1);
         assertEquals(currentTime, lastCleanup);
     }
 
     @Test
+    @Feature({"WebApk"})
+    public void testCleanupRemovesUninstalledWebApks() throws Exception {
+        String webappId = "webapk:uninstalledWebApk";
+        String webApkPackage = "uninstalledWebApk";
+        FetchStorageCallback storageCallback = new FetchStorageCallback(
+                createWebApkIntent(webappId, webApkPackage));
+        WebappRegistry.registerWebapp(Robolectric.application, webappId, storageCallback);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+        assertTrue(storageCallback.getCallbackCalled());
+
+        // Put the current time such that the task runs.

[pkotwicz, 2016/06/29 21:26:18]

Nit: Put -> Set

[Xi Han, 2016/06/29 21:58:13]

Done.

+        long currentTime = System.currentTimeMillis() + WebappRegistry.FULL_CLEANUP_DURATION;
+        // Because the time is just inside the window, there should be a cleanup of
+        // uninstalled WebAPKs and the last cleaned up time should be set to the
+        // current time.
+        WebappRegistry.unregisterOldWebapps(Robolectric.application, currentTime);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+
+        Set<String> actual = mSharedPreferences.getStringSet(
+                WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
+        assertTrue(actual.isEmpty());
+
+        long lastCleanup = mSharedPreferences.getLong(
+                WebappRegistry.KEY_LAST_CLEANUP, -1);
+        assertEquals(currentTime, lastCleanup);
+    }
+
+    @Test
+    @Feature({"WebApk"})
+    public void testCleanupDoNotRemovesInstalledWebApks() throws Exception {
+        String webappId = "webapk:installedWebApk";
+        String webApkPackage = "installedWebApk";
+        FetchStorageCallback storageCallback = new FetchStorageCallback(
+                createWebApkIntent(webappId, webApkPackage));
+        WebappRegistry.registerWebapp(Robolectric.application, webappId, storageCallback);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+        assertTrue(storageCallback.getCallbackCalled());
+
+        Robolectric.packageManager.addPackage(webApkPackage);
+
+        // Put the current time such that the task runs.

[pkotwicz, 2016/06/29 21:26:18]

Nit: Put -> Set

[Xi Han, 2016/06/29 21:58:13]

Done.

+        long currentTime = System.currentTimeMillis() + WebappRegistry.FULL_CLEANUP_DURATION;
+        // Because the time is just inside the window, there should be a cleanup of
+        // uninstalled WebAPKs and the last cleaned up time should be set to the
+        // current time.
+        WebappRegistry.unregisterOldWebapps(Robolectric.application, currentTime);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+
+        Set<String> actual = mSharedPreferences.getStringSet(
+                WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
+        assertEquals(1, actual.size());
+        assertTrue(actual.contains(webappId));
+
+        long lastCleanup = mSharedPreferences.getLong(
+                WebappRegistry.KEY_LAST_CLEANUP, -1);
+        assertEquals(currentTime, lastCleanup);
+    }
+
+    @Test
     @Feature({"Webapp"})
     public void testClearWebappHistoryRunsCallback() throws Exception {
         CallbackRunner callback = new CallbackRunner();
         WebappRegistry.clearWebappHistory(Robolectric.application, callback);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         assertTrue(callback.getCallbackCalled());
     }
 
@@ skipping 235 matching lines @@
     private Set<String> getRegisteredWebapps() {
         return mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
     }
 
     private Intent createShortcutIntent(String url) {
         return ShortcutHelper.createWebappShortcutIntent("id", "action", url,
                 ShortcutHelper.getScopeFromUrl(url), "name", "shortName", null,
                 ShortcutHelper.WEBAPP_SHORTCUT_VERSION, WebDisplayMode.Standalone, 0, 0, 0, false);
     }
+
+    private Intent createWebApkIntent(String webappId, String webApkPackage) {
+        Intent intent = new Intent();
+        intent.putExtra(ShortcutHelper.EXTRA_ID, webappId)
+              .putExtra(ShortcutHelper.EXTRA_URL, "https://foo.com")
+              .putExtra(ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackage);
+        return intent;
+    }
 }