[android] Resize the android_webview if it's 0x0 initially.

android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
index cf59ae5b62b1bc54d16b279f894d88d1b4cac59e..0c1d1e0cba1c6eea67d3585c24e8c4e08819a153 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
@@ -12,6 +12,7 @@ import org.chromium.android_webview.AwBrowserContext;
 import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient;
+import org.chromium.android_webview.AwLayoutSizer;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.base.test.util.InMemorySharedPreferences;
@@ -189,26 +190,52 @@ public class AwTestBase
         });
     }
 
+    /**
+     * Factory class used in creation of test AwContents instances.
+     *
+     * Test cases can provide subclass instances to the createAwTest* methods in order to create an
+     * AwContents instance with injected test dependencies.
+     */
+    public static class TestDependencyFactory {
+        public AwLayoutSizer createLayoutSizer() {
+            return new AwLayoutSizer();
+        }
+    }
+
     protected AwTestContainerView createAwTestContainerView(
             final AwContentsClient awContentsClient) {
-        return createAwTestContainerView(new AwTestContainerView(getActivity()),
-                awContentsClient);
+        return createAwTestContainerView(awContentsClient, new TestDependencyFactory());
     }
 
     protected AwTestContainerView createAwTestContainerView(
-            final AwTestContainerView testContainerView,
-            final AwContentsClient awContentsClient) {
+            final AwContentsClient awContentsClient,
+            final TestDependencyFactory testDependencyFactory) {
+        AwTestContainerView testContainerView =
+            createDetachedAwTestContainerView(awContentsClient, testDependencyFactory);
+        getActivity().addView(testContainerView);
+        testContainerView.requestFocus();
+        return testContainerView;
+    }
+
+    protected AwTestContainerView createDetachedAwTestContainerView(
+            final AwContentsClient awContentsClient,
+            final TestDependencyFactory testDependencyFactory) {
+        final AwTestContainerView testContainerView = new AwTestContainerView(getActivity());
         testContainerView.initialize(new AwContents(
                 new AwBrowserContext(new InMemorySharedPreferences()),
                 testContainerView, testContainerView.getInternalAccessDelegate(),
-                awContentsClient, false));
-        getActivity().addView(testContainerView);
-        testContainerView.requestFocus();
+                awContentsClient, false, testDependencyFactory.createLayoutSizer()));
         return testContainerView;
     }
 
     protected AwTestContainerView createAwTestContainerViewOnMainSync(
             final AwContentsClient client) throws Exception {
+        return createAwTestContainerViewOnMainSync(client, new TestDependencyFactory());
+    }
+
+    protected AwTestContainerView createAwTestContainerViewOnMainSync(
+            final AwContentsClient client,
+            final TestDependencyFactory testDependencyFactory) throws Exception {
         final AtomicReference<AwTestContainerView> testContainerView =
                 new AtomicReference<AwTestContainerView>();
         getInstrumentation().runOnMainSync(new Runnable() {