Hookup android_webview scroll offset delegation to Java side.

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

 // Copyright 2013 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.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup.LayoutParams;
@@ skipping 47 matching lines @@
             mOnContentSizeChangedHelper.onContentSizeChanged(widthCss, heightCss);
         }
 
         @Override
         public void onPageScaleChanged(double pageScaleFactor) {
             super.onPageScaleChanged(pageScaleFactor);
             mOnPageScaleChangedHelper.notifyCalled();
         }
     }
 
-    private class DependencyFactory extends TestDependencyFactory {
-        @Override
-        public AwLayoutSizer createLayoutSizer() {
-            return new TestAwLayoutSizer();
-        }
+    @Override
+    protected TestDependencyFactory createTestDependencyFactory() {
+        return new TestDependencyFactory() {
+            @Override
+            public AwLayoutSizer createLayoutSizer() {
+                return new TestAwLayoutSizer();
+            }
+        };
     }
 
     final LinearLayout.LayoutParams wrapContentLayoutParams =
         new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 
     private AwTestContainerView createCustomTestContainerViewOnMainSync(
             final AwContentsClient awContentsClient, final int visibility) throws Exception {
         final AtomicReference<AwTestContainerView> testContainerView =
                 new AtomicReference<AwTestContainerView>();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                testContainerView.set(createAwTestContainerView(awContentsClient,
-                        new DependencyFactory()));
+                testContainerView.set(createAwTestContainerView(awContentsClient));
                 testContainerView.get().setLayoutParams(wrapContentLayoutParams);
                 testContainerView.get().setVisibility(visibility);
             }
         });
         return testContainerView.get();
     }
 
     private AwTestContainerView createDetachedTestContainerViewOnMainSync(
             final AwContentsClient awContentsClient) {
         final AtomicReference<AwTestContainerView> testContainerView =
                 new AtomicReference<AwTestContainerView>();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                testContainerView.set(createDetachedAwTestContainerView(awContentsClient,
-                        new DependencyFactory()));
+                testContainerView.set(createDetachedAwTestContainerView(awContentsClient));
             }
         });
         return testContainerView.get();
     }
 
     private void assertZeroHeight(final AwTestContainerView testContainerView) throws Throwable {
         // Make sure the test isn't broken by the view having a non-zero height.
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
@@ skipping 69 matching lines @@
         assertZeroHeight(testContainerView);
 
         final int contentSizeChangeCallCount = mOnContentSizeChangedHelper.getCallCount();
         final int pageScaleChangeCallCount = mOnPageScaleChangedHelper.getCallCount();
         loadUrlAsync(testContainerView.getAwContents(), CommonResources.ABOUT_HTML);
         mOnPageScaleChangedHelper.waitForCallback(pageScaleChangeCallCount);
         mOnContentSizeChangedHelper.waitForCallback(contentSizeChangeCallCount);
         assertTrue(mOnContentSizeChangedHelper.getHeight() > 0);
     }
 }