Store standalone web app data in WebappDataStorage as well as the homescreen intent.

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
index 2b83f9a2d1f2ce6f76aa48fd35ce776e60182594..24fc292dd018a81d4a5a9d1e2249f69c89e1d1fc 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
@@ -11,6 +11,7 @@ import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.preferences.ButtonPreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
@@ -48,7 +49,7 @@ public class ClearBrowsingDataPreferencesTest
      */
     @MediumTest
     public void testClearingSiteDataClearsWebapps() throws Exception {
-        WebappRegistry.registerWebapp(getActivity(), "first", "https://www.google.com");
+        WebappRegistry.registerWebapp(getActivity(), "first");
         WebappRegistry.getRegisteredWebappIds(getActivity(), new WebappRegistry.FetchCallback() {
             @Override
             public void onWebappIdsRetrieved(Set<String> ids) {
@@ -109,7 +110,9 @@ public class ClearBrowsingDataPreferencesTest
      */
     @MediumTest
     public void testClearingHistoryClearsWebappScopesAndLaunchTimes() throws Exception {
-        WebappRegistry.registerWebapp(getActivity(), "first", "https://www.google.com");
+        WebappDataStorage storage = WebappRegistry.registerWebapp(getActivity(), "first");
+        storage.updateFromShortcutIntent(ShortcutHelper.createWebappShortcutIntent(
+                    "id", "action", "url", "name", "shortName", null, 0, 0, 0, false));
         WebappRegistry.getRegisteredWebappIds(getActivity(), new WebappRegistry.FetchCallback() {
             @Override
             public void onWebappIdsRetrieved(Set<String> ids) {
@@ -165,7 +168,7 @@ public class ClearBrowsingDataPreferencesTest
         });
         mCallbackCalled = false;
 
-        // Scope should be empty.
+        // URL and scope should be empty.
         WebappDataStorage.getScope(getActivity(), "first",
                 new WebappDataStorage.FetchCallback<String>() {
                     @Override
@@ -183,6 +186,23 @@ public class ClearBrowsingDataPreferencesTest
         });
         mCallbackCalled = false;
 
+        WebappDataStorage.getURL(getActivity(), "first",
+                new WebappDataStorage.FetchCallback<String>() {
+                    @Override
+                    public void onDataRetrieved(String readObject) {
+                        assertEquals(readObject, "");
+                        mCallbackCalled = true;
+                    }
+                }
+        );
+        CriteriaHelper.pollUiThread(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mCallbackCalled;
+            }
+        });
+        mCallbackCalled = false;
+
         // The last used time should be 0.
         WebappDataStorage.getLastUsedTime(getActivity(), "first",
                 new WebappDataStorage.FetchCallback<Long>() {