Clear webapp storage when site data is cleared

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

Index: chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java
index a903f58a38c2e9711b946acb5515f98888d52061..0d615649d4b3ca1e78a839ea2f1a1637a7d83774 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java
@@ -19,8 +19,10 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -82,13 +84,7 @@ public class WebappRegistryTest {
     @Test
     @Feature({"Webapp"})
     public void testWebappIdsRetrieval() throws Exception {
-        final Set<String> expected = new HashSet<String>();
-        expected.add("first");
-        expected.add("second");
-
-        mSharedPreferences.edit()
-                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
-                .commit();
+        final Set<String> expected = addWebappsToRegistry("first", "second");
 
         WebappRegistry.getRegisteredWebappIds(Robolectric.application,
                 new WebappRegistry.FetchCallback() {
@@ -107,12 +103,7 @@ public class WebappRegistryTest {
     @Test
     @Feature({"Webapp"})
     public void testWebappIdsRetrievalRegisterRetrival() throws Exception {
-        final Set<String> expected = new HashSet<String>();
-        expected.add("first");
-
-        mSharedPreferences.edit()
-                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
-                .commit();
+        final Set<String> expected = addWebappsToRegistry("first");
 
         WebappRegistry.getRegisteredWebappIds(Robolectric.application,
                 new WebappRegistry.FetchCallback() {
@@ -149,4 +140,59 @@ public class WebappRegistryTest {
 
         assertTrue(mCallbackCalled);
     }
+
+    @Test
+    @Feature({"Webapp"})
+    public void testUnregisterRunsCallback() throws Exception {
+        WebappRegistry.unregisterAllWebapps(Robolectric.application, new Runnable() {
+            @Override
+            public void run() {
+                mCallbackCalled = true;
+            }
+        });
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+
+        assertTrue(mCallbackCalled);
+    }
+
+    @Test
+    @Feature({"Webapp"})
+    public void testUnregisterClearsRegistry() throws Exception {
+        addWebappsToRegistry("test");
+
+        WebappRegistry.unregisterAllWebapps(Robolectric.application, null);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+
+        assertTrue(getRegisteredWebapps().isEmpty());
+    }
+
+    @Test
+    @Feature({"Webapp"})
+    public void testUnregisterClearsWebappDataStorage() throws Exception {
+        SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
+                WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "test", Context.MODE_PRIVATE);
+        webAppPrefs.edit()
+                .putLong(WebappDataStorage.KEY_LAST_USED, 100L)
+                .commit();
+
+        WebappRegistry.unregisterAllWebapps(Robolectric.application, null);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+
+        Map<String, ?> actual = webAppPrefs.getAll();

[mlamouri (slow - plz ping), 2015/09/10 11:45:35]

Map<String, ?> is an interesting notation. It says how much I know about Java :)

[Lalit Maganti, 2015/09/10 16:37:02]

Yeah generics in Java can get insane. This is still pretty tame :P

+        assertTrue(actual.isEmpty());
+    }
+
+    private Set<String> addWebappsToRegistry(String... webapps) {
+        final Set<String> expected = new HashSet<String>(Arrays.asList(webapps));
+        mSharedPreferences.edit()
+                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
+                .commit();
+        return expected;
+    }
+
+    private Set<String> getRegisteredWebapps() {
+        return mSharedPreferences.getStringSet(
+                WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
+    }
 }