[Reland] Refactor WebappRegistry into a singleton instance.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 78 matching lines @@
         public String getFullscreenAction() {
             return WEBAPP_ACTION_NAME;
         }
 
         public void clearBroadcastedIntent() {
             mBroadcastedIntent = null;
         }
     }
 
     private static class TestDataStorageFactory extends WebappDataStorage.Factory {
-        public Bitmap mSplashImage;
+        public String mSplashImage;
 
         @Override
         public WebappDataStorage create(final String webappId) {
             return new WebappDataStorageWrapper(webappId);
         }
 
         private class WebappDataStorageWrapper extends WebappDataStorage {
 
             public WebappDataStorageWrapper(String webappId) {
                 super(webappId);
             }
 
             @Override
-            public void updateSplashScreenImage(Bitmap splashScreenImage) {
+            public void updateSplashScreenImage(String splashScreenImage) {
                 assertNull(mSplashImage);
                 mSplashImage = splashScreenImage;
             }
         }
     }
     /**
      * Test AddToHomescreenManager subclass which mocks showing the add-to-homescreen dialog and
      * adds the shortcut to the home screen once it is ready.
      */
     private static class TestAddToHomescreenManager extends AddToHomescreenManager {
@@ skipping 149 matching lines @@
             CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return dataStorageFactory.mSplashImage != null;
                 }
             });
 
             // 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();
         }
     }
 
     private void loadUrl(String url, String expectedPageTitle) throws Exception {
         new TabLoadObserver(mTab, expectedPageTitle, null).fullyLoadUrl(url);
     }
 
     private void addShortcutToTab(Tab tab, String title) throws Exception {
@@ skipping 50 matching lines @@
             public Integer call() {
                 return getActivity().getTabModelSelector().getModel(false).getCount();
             }
         }));
 
         TabModel tabModel = getActivity().getTabModelSelector().getModel(false);
         assertEquals(0, tabModel.indexOf(mTab));
         return getActivity().getTabModelSelector().getModel(false).getTabAt(1);
     }
 }