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

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
index 7d99adf331cc1e15ecb4b181456faa29f6534973..f5c8df734d5400c05a9cb94f6654cbc032438bcc 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
@@ -20,6 +20,7 @@ class TestAwContentsClient extends NullContentsClient {
     private OnReceivedErrorHelper mOnReceivedErrorHelper;
     private OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
     private AddMessageToConsoleHelper mAddMessageToConsoleHelper;
+    private OnScaleChangedHelper mOnScaleChangedHelper;
 
     public TestAwContentsClient() {
         mOnPageStartedHelper = new OnPageStartedHelper();
@@ -27,6 +28,7 @@ class TestAwContentsClient extends NullContentsClient {
         mOnReceivedErrorHelper = new OnReceivedErrorHelper();
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
         mAddMessageToConsoleHelper = new AddMessageToConsoleHelper();
+        mOnScaleChangedHelper = new OnScaleChangedHelper();
     }
 
     public OnPageStartedHelper getOnPageStartedHelper() {
@@ -49,6 +51,29 @@ class TestAwContentsClient extends NullContentsClient {
         return mAddMessageToConsoleHelper;
     }
 
+    public static class OnScaleChangedHelper extends CallbackHelper {
+        private final Object mLock = new Object();
+        private float mPreviousScale;
+        private float mCurrentScale;
+        public void notifyCalled(float oldScale, float newScale) {
+            synchronized(mLock) {
+                mPreviousScale = oldScale;
+                mCurrentScale = newScale;
+            }
+            super.notifyCalled();
+        }
+        public float getLastScaleRatio() {
+            assert getCallCount() > 0;
+            synchronized(mLock) {
+                return mCurrentScale / mPreviousScale;
+            }
+        }
+    }
+
+    public OnScaleChangedHelper getOnScaleChangedHelper() {
+        return mOnScaleChangedHelper;
+    }
+
     @Override
     public void onUpdateTitle(String title) {
         mUpdatedTitle = title;
@@ -174,4 +199,9 @@ class TestAwContentsClient extends NullContentsClient {
         mLastAutoLoginAccount = account;
         mLastAutoLoginArgs = args;
     }
+
+    @Override
+    public void onScaleChanged(float oldScale, float newScale) {
+        mOnScaleChangedHelper.notifyCalled(oldScale, newScale);
+    }
 }