[Reland] Refactor WebappRegistry into a singleton instance.

chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java
index 434c989cff9be5e77db3a71c542268e7846dbb6e..7b4a76b24068d2f757a8200262b76d0fa211caa6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java
@@ -14,7 +14,7 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge.OnClearBrowsingDataListener;
-import org.chromium.chrome.browser.webapps.WebappDataStorage;
+import org.chromium.chrome.browser.webapps.TestFetchStorageCallback;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
@@ -24,7 +24,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Integration tests for the native BrowsingDataRemover.
@@ -67,18 +66,12 @@ public class BrowsingDataRemoverIntegrationTest extends ChromeActivityTestCaseBa
                 return ShortcutHelper.createWebappShortcutIntentForTesting(webappId, webappUrl);
             }
         };
-        final Intent shortcutIntent = shortcutIntentTask.execute().get();
-
-        WebappRegistry.registerWebapp(
-                webappId, new WebappRegistry.FetchWebappDataStorageCallback() {
-                    @Override
-                    public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
-                        storage.updateFromShortcutIntent(shortcutIntent);
-                        mCallbackCalled = true;
-                    }
-                });
 
-        CriteriaHelper.pollUiThread(new CallbackCriteria());
+        final Intent shortcutIntent = shortcutIntentTask.execute().get();
+        TestFetchStorageCallback callback = new TestFetchStorageCallback();
+        WebappRegistry.getInstance().register(webappId, callback);
+        callback.waitForCallback(0);
+        callback.getStorage().updateFromShortcutIntent(shortcutIntent);
     }
 
     /**
@@ -98,16 +91,7 @@ public class BrowsingDataRemoverIntegrationTest extends ChromeActivityTestCaseBa
         for (final Map.Entry<String, String> app : apps.entrySet()) {
             registerWebapp(app.getKey(), app.getValue());
         }
-
-        // Wait for the registration to finish.
-        WebappRegistry.getRegisteredWebappIds(new WebappRegistry.FetchCallback() {
-            @Override
-            public void onWebappIdsRetrieved(Set<String> ids) {
-                assertEquals(apps.keySet(), ids);
-                mCallbackCalled = true;
-            }
-        });
-        CriteriaHelper.pollUiThread(new CallbackCriteria());
+        assertEquals(apps.keySet(), WebappRegistry.getRegisteredWebappIdsForTesting());
 
         // Clear cookies and site data excluding the registrable domain "google.com".
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ -131,14 +115,8 @@ public class BrowsingDataRemoverIntegrationTest extends ChromeActivityTestCaseBa
         CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         // The last two webapps should have been unregistered.
-        WebappRegistry.getRegisteredWebappIds(new WebappRegistry.FetchCallback() {
-            @Override
-            public void onWebappIdsRetrieved(Set<String> ids) {
-                assertEquals(new HashSet<String>(Arrays.asList("webapp1")), ids);
-                mCallbackCalled = true;
-            }
-        });
-        CriteriaHelper.pollUiThread(new CallbackCriteria());
+        assertEquals(new HashSet<String>(Arrays.asList("webapp1")),
+                WebappRegistry.getRegisteredWebappIdsForTesting());
 
         // Clear cookies and site data with no url filter.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ -158,13 +136,6 @@ public class BrowsingDataRemoverIntegrationTest extends ChromeActivityTestCaseBa
         CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         // All webapps should have been unregistered.
-        WebappRegistry.getRegisteredWebappIds(new WebappRegistry.FetchCallback() {
-            @Override
-            public void onWebappIdsRetrieved(Set<String> ids) {
-                assertTrue(ids.isEmpty());
-                mCallbackCalled = true;
-            }
-        });
-        CriteriaHelper.pollUiThread(new CallbackCriteria());
+        assertTrue(WebappRegistry.getRegisteredWebappIdsForTesting().isEmpty());
     }
 }