[Reland] Refactor WebappRegistry into a singleton instance.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenTest.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.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 10 matching lines @@
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.metrics.WebappUma;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabTestUtils;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
 
 /**
  * Tests for splash screens.
  */
 public class WebappSplashScreenTest extends WebappActivityTestBase {
+
+    private boolean mCallbackCalled;
+
+    private class CallbackCriteria extends Criteria {
+        public CallbackCriteria() {
+            mCallbackCalled = false;
+        }
+
+        @Override
+        public boolean isSatisfied() {
+            if (mCallbackCalled) {
+                mCallbackCalled = false;
+                return true;
+            }
+            return false;
+        }
+    }
+
     private int getHistogramTotalCountFor(String histogram, int buckets) {
         int count = 0;
 
         for (int i = 0; i < buckets; ++i) {
             count += RecordHistogram.getHistogramValueCountForTesting(histogram, i);
         }
 
         return count;
     }
 
@@ skipping 182 matching lines @@
     }
 
     @SmallTest
     @Feature({"Webapps"})
     @RetryOnFailure
     public void testRegularSplashScreenAppears() throws Exception {
         // Register a properly-sized icon for the splash screen.
         Context context = getInstrumentation().getTargetContext();
         int thresholdSize = context.getResources().getDimensionPixelSize(
                 R.dimen.webapp_splash_image_size_threshold);
-        int bitmapSize = thresholdSize + 1;
-        Bitmap splashBitmap = Bitmap.createBitmap(bitmapSize, bitmapSize, Bitmap.Config.ARGB_8888);
-        WebappDataStorage.open(WEBAPP_ID).updateSplashScreenImage(splashBitmap);
+        int size = thresholdSize + 1;
+        final Bitmap splashBitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+
+        WebappRegistry.getInstance().register(
+                WEBAPP_ID, new WebappRegistry.FetchWebappDataStorageCallback() {
+                    @Override
+                    public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
+                        mCallbackCalled = true;
+                        storage.updateSplashScreenImage(splashBitmap);
+                    }
+                });
+        CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         startWebappActivity(createIntent());
         ViewGroup splashScreen = waitUntilSplashScreenAppears();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
 
         ImageView splashImage =
                 (ImageView) splashScreen.findViewById(R.id.webapp_splash_screen_icon);
-        assertEquals(bitmapSize, splashImage.getMeasuredWidth());
-        assertEquals(bitmapSize, splashImage.getMeasuredHeight());
+        assertEquals(size, splashImage.getMeasuredWidth());
+        assertEquals(size, splashImage.getMeasuredHeight());
 
         TextView splashText = (TextView) splashScreen.findViewById(R.id.webapp_splash_screen_name);
         int[] rules = ((RelativeLayout.LayoutParams) splashText.getLayoutParams()).getRules();
         assertEquals(RelativeLayout.TRUE, rules[RelativeLayout.ALIGN_PARENT_BOTTOM]);
         assertEquals(0, rules[RelativeLayout.BELOW]);
     }
 
     @SmallTest
     @Feature({"Webapps"})
     @RetryOnFailure
     public void testSmallSplashScreenAppears() throws Exception {
         // Register a smaller icon for the splash screen.
         Context context = getInstrumentation().getTargetContext();
         int thresholdSize = context.getResources().getDimensionPixelSize(
                 R.dimen.webapp_splash_image_size_threshold);
-        int bitmapSize = context.getResources().getDimensionPixelSize(
+        int size = context.getResources().getDimensionPixelSize(
                 R.dimen.webapp_splash_image_size_minimum);
-        Bitmap splashBitmap = Bitmap.createBitmap(bitmapSize, bitmapSize, Bitmap.Config.ARGB_8888);
-        WebappDataStorage.open(WEBAPP_ID).updateSplashScreenImage(splashBitmap);
+        final Bitmap splashBitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+
+        WebappRegistry.getInstance().register(
+                WEBAPP_ID, new WebappRegistry.FetchWebappDataStorageCallback() {
+                    @Override
+                    public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
+                        mCallbackCalled = true;
+                        storage.updateSplashScreenImage(splashBitmap);
+                    }
+                });
+        CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         startWebappActivity(createIntent());
         ViewGroup splashScreen = waitUntilSplashScreenAppears();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
 
         // The icon is centered within a fixed-size area on the splash screen.
         ImageView splashImage =
                 (ImageView) splashScreen.findViewById(R.id.webapp_splash_screen_icon);
         assertEquals(thresholdSize, splashImage.getMeasuredWidth());
         assertEquals(thresholdSize, splashImage.getMeasuredHeight());
 
         // The web app name is anchored to the icon.
         TextView splashText = (TextView) splashScreen.findViewById(R.id.webapp_splash_screen_name);
         int[] rules = ((RelativeLayout.LayoutParams) splashText.getLayoutParams()).getRules();
         assertEquals(0, rules[RelativeLayout.ALIGN_PARENT_BOTTOM]);
         assertEquals(R.id.webapp_splash_screen_icon, rules[RelativeLayout.BELOW]);
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testSplashScreenWithoutImageAppears() throws Exception {
         // Register an image that's too small for the splash screen.
         Context context = getInstrumentation().getTargetContext();
-        int bitmapSize = context.getResources().getDimensionPixelSize(
+        int size = context.getResources().getDimensionPixelSize(
                 R.dimen.webapp_splash_image_size_minimum) - 1;
-        Bitmap splashBitmap = Bitmap.createBitmap(bitmapSize, bitmapSize, Bitmap.Config.ARGB_8888);
-        WebappDataStorage.open(WEBAPP_ID).updateSplashScreenImage(splashBitmap);
+        final Bitmap splashBitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+
+        WebappRegistry.getInstance().register(
+                WEBAPP_ID, new WebappRegistry.FetchWebappDataStorageCallback() {
+                    @Override
+                    public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
+                        mCallbackCalled = true;
+                        storage.updateSplashScreenImage(splashBitmap);
+                    }
+                });
+        CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         Intent intent = createIntent();
         intent.putExtra(ShortcutHelper.EXTRA_IS_ICON_GENERATED, true);
         startWebappActivity(intent);
         ViewGroup splashScreen = waitUntilSplashScreenAppears();
         assertTrue(getActivity().isSplashScreenVisibleForTests());
 
         // There's no icon displayed.
         ImageView splashImage =
                 (ImageView) splashScreen.findViewById(R.id.webapp_splash_screen_icon);
@@ skipping 29 matching lines @@
 
         // The web app name is anchored to the top of the spacer.
         TextView splashText = (TextView) splashScreen.findViewById(R.id.webapp_splash_screen_name);
         int[] rules = ((RelativeLayout.LayoutParams) splashText.getLayoutParams()).getRules();
         assertEquals(0, rules[RelativeLayout.ALIGN_PARENT_BOTTOM]);
         assertEquals(0, rules[RelativeLayout.BELOW]);
         assertEquals(0, rules[RelativeLayout.CENTER_IN_PARENT]);
         assertEquals(R.id.webapp_splash_space, rules[RelativeLayout.ABOVE]);
     }
 }