Revert of [Reland] Refactor WebappRegistry into a singleton instance.

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
index 89f779e49618e13c40eb313d3bcbb3242253183c..996c76b7903c0a770822ac37c9029abfb5288510 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
@@ -168,7 +168,7 @@
                 // Store the webapp data so that it is accessible without the intent. Once this
                 // process is complete, call back to native code to start the splash image
                 // download.
-                WebappRegistry.getInstance().register(
+                WebappRegistry.registerWebapp(
                         id, new WebappRegistry.FetchWebappDataStorageCallback() {
                             @Override
                             public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
@@ -228,7 +228,7 @@
     }
 
     /**
-     * Stores the specified bitmap as the splash screen for a web app.
+     * Creates a storage location and stores the data for a web app using {@link WebappDataStorage}.
      * @param id          ID of the web app which is storing data.
      * @param splashImage Image which should be displayed on the splash screen of
      *                    the web app. This can be null of there is no image to show.
@@ -236,8 +236,16 @@
     @SuppressWarnings("unused")
     @CalledByNative
     private static void storeWebappSplashImage(final String id, final Bitmap splashImage) {
-        WebappDataStorage storage = WebappRegistry.getInstance().getWebappDataStorage(id);
-        if (storage != null) storage.updateSplashScreenImage(splashImage);
+        WebappRegistry.getWebappDataStorage(
+                id, new WebappRegistry.FetchWebappDataStorageCallback() {
+                    @Override
+                    public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
+                        if (storage == null) return;
+
+                        storage.updateSplashScreenImage(splashImage);
+                    }
+
+                });
     }
 
     /**