[Reland] Refactor WebappRegistry into a singleton instance.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java
index 01aa9621c5c441e54fa60394f037f0b11e232418..4e1777bbf31d4780ccf459dbed584ed6f4d5e8e2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java
@@ -96,7 +96,7 @@ public class AddToHomescreenManagerTest extends ChromeActivityTestCaseBase<Chrom
     }
 
     private static class TestDataStorageFactory extends WebappDataStorage.Factory {
-        public Bitmap mSplashImage;
+        public String mSplashImage;
 
         @Override
         public WebappDataStorage create(final String webappId) {
@@ -110,7 +110,7 @@ public class AddToHomescreenManagerTest extends ChromeActivityTestCaseBase<Chrom
             }
 
             @Override
-            public void updateSplashScreenImage(Bitmap splashScreenImage) {
+            public void updateSplashScreenImage(String splashScreenImage) {
                 assertNull(mSplashImage);
                 mSplashImage = splashScreenImage;
             }
@@ -280,8 +280,10 @@ public class AddToHomescreenManagerTest extends ChromeActivityTestCaseBase<Chrom
             // Test that bitmap sizes match expectations.
             int idealSize = mActivity.getResources().getDimensionPixelSize(
                     R.dimen.webapp_splash_image_size_ideal);
-            assertEquals(idealSize, dataStorageFactory.mSplashImage.getWidth());
-            assertEquals(idealSize, dataStorageFactory.mSplashImage.getHeight());
+            Bitmap splashImage =
+                    ShortcutHelper.decodeBitmapFromString(dataStorageFactory.mSplashImage);
+            assertEquals(idealSize, splashImage.getWidth());
+            assertEquals(idealSize, splashImage.getHeight());
         } finally {
             mTestServer.stopAndDestroyServer();
         }