[Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
index 3e9e5c99626a683a5f69cbb1b77342100462b34f..d3e6c6fd9875a848270dd13214036690a7d6367f 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
@@ -18,26 +18,6 @@ import android.util.Log;
  * Tests for the WebViewClient.onScaleChanged.
  */
 public class AwContentsClientOnScaleChangedTest extends AndroidWebViewTestBase {
-    private static class OnScaleChangedHelper extends CallbackHelper {
-       private float mLastScaleRatio;
-
-       public void notifyCalled(float ratio) {
-           super.notifyCalled();
-           mLastScaleRatio = ratio;
-       }
-    }
-
-    private static class TestAwContentsClient
-            extends org.chromium.android_webview.test.TestAwContentsClient {
-         private OnScaleChangedHelper mOnScaleChangedHelper = new OnScaleChangedHelper();
-         @Override
-         public void onScaleChanged(float oldScale, float newScale) {
-             // We should not be getting any messages from scrolling.
-             assertTrue(oldScale != newScale);
-             mOnScaleChangedHelper.notifyCalled(newScale / oldScale);
-         }
-    }
-
     private TestAwContentsClient mContentsClient;
     private AwContents mAwContents;
 
@@ -65,11 +45,12 @@ public class AwContentsClientOnScaleChangedTest extends AndroidWebViewTestBase {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
              CommonResources.ABOUT_HTML, "text/html", false);
         ContentViewCore core = mAwContents.getContentViewCore();
-        int callCount = mContentsClient.mOnScaleChangedHelper.getCallCount();
+        int callCount = mContentsClient.getOnScaleChangedHelper().getCallCount();
         core.onSizeChanged(core.getWidth() / 2, core.getHeight() / 2,
              core.getWidth(), core.getHeight());
         // TODO: Investigate on using core.zoomIn();
-        mContentsClient.mOnScaleChangedHelper.waitForCallback(callCount);
-        assertTrue(mContentsClient.mOnScaleChangedHelper.mLastScaleRatio < 1);
+        mContentsClient.getOnScaleChangedHelper().waitForCallback(callCount);
+        assertTrue("Scale ratio:" + mContentsClient.getOnScaleChangedHelper().getLastScaleRatio(),
+                mContentsClient.getOnScaleChangedHelper().getLastScaleRatio() < 1);
     }
 }