[Android WebView] Fix AwSettingsTest.testLoadWithOverviewModeXXX flakiness

The issue was in using the page scale from AwContents and ContentViewCore
simultaneously. This was leading to races as both classes maintain their
own copies of the page scale which seem to be updated indepentently.

BUG=239144

Review URL: https://codereview.chromium.org/68103009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234521 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 11 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index d1bba9c0..dda4946 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -2423,12 +2423,8 @@ public class AwSettingsTest extends AwTestBase {
                 zoomedOutScale < initialScale);
     }
 
-    /*
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    http://crbug.com/239144
-    */
-    @DisabledTest
     public void testLoadWithOverviewModeWithTwoViews() throws Throwable {
         ViewPair views = createViews();
         runPerViewSettingsTest(
@@ -2438,12 +2434,8 @@ public class AwSettingsTest extends AwTestBase {
                         views.getContents1(), views.getClient1(), false));
     }
 
-    /*
-     @SmallTest
-     @Feature({"AndroidWebView", "Preferences"})
-     http://crbug.com/239144
-     */
-    @DisabledTest
+    @SmallTest
+    @Feature({"AndroidWebView", "Preferences"})
     public void testLoadWithOverviewModeViewportTagWithTwoViews() throws Throwable {
         ViewPair views = createViews();
         runPerViewSettingsTest(
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 57264a7..329a8b9 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
@@ -363,7 +363,7 @@ public class AwTestBase
         return runTestOnUiThreadAndGetResult(new Callable<Float>() {
             @Override
             public Float call() throws Exception {
-                return awContents.getContentViewCore().getScale();
+                return awContents.getPageScaleFactor();
             }
         });
     }