Index: android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java |
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java |
index b1c645107644f8c584d87c0a85dfc36165dcc3b5..9409ff7f32cf1a9384497b0b8b9b1c654c72af56 100644 |
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java |
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java |
@@ -11,6 +11,7 @@ import android.test.suitebuilder.annotation.SmallTest; |
import android.view.View; |
import android.view.ViewConfiguration; |
+import org.chromium.android_webview.AwContents; |
import org.chromium.base.ThreadUtils; |
import org.chromium.base.test.util.DisabledTest; |
import org.chromium.base.test.util.Feature; |
@@ -29,14 +30,17 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { |
private static final int CHECK_INTERVAL_MS = 100; |
private TestAwContentsClient mContentsClient; |
+ private AwContents mAwContents; |
private ContentViewCore mContentViewCore; |
@Override |
public void setUp() throws Exception { |
super.setUp(); |
mContentsClient = new TestAwContentsClient(); |
- mContentViewCore = |
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore(); |
+ final AwTestContainerView testContainerView = |
+ createAwTestContainerViewOnMainSync(mContentsClient); |
+ mAwContents = testContainerView.getAwContents(); |
+ mContentViewCore = testContainerView.getContentViewCore(); |
} |
private String getZoomableHtml() { |
@@ -189,11 +193,11 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { |
} |
private void runMagnificationTest(boolean supportZoom) throws Throwable { |
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), |
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |
getZoomableHtml(), "text/html", false); |
// It takes some time for scaling to settle down. |
waitUntilCanNotZoomOut(); |
- getContentSettingsOnUiThread(mContentViewCore).setSupportZoom(supportZoom); |
+ getContentSettingsOnUiThread(mAwContents).setSupportZoom(supportZoom); |
assertTrue("Should be able to zoom in", canZoomInOnUiThread()); |
assertFalse("Should not be able to zoom out", canZoomOutOnUiThread()); |
@@ -233,18 +237,18 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { |
@SmallTest |
@Feature({"Android-WebView"}) |
public void testZoomUsingMultiTouch() throws Throwable { |
- ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore); |
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), |
+ ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents); |
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |
getZoomableHtml(), "text/html", false); |
assertTrue(webSettings.supportZoom()); |
assertFalse(webSettings.getBuiltInZoomControls()); |
assertFalse(isMultiTouchZoomSupportedOnUiThread()); |
- getContentSettingsOnUiThread(mContentViewCore).setBuiltInZoomControls(true); |
+ getContentSettingsOnUiThread(mAwContents).setBuiltInZoomControls(true); |
assertTrue(isMultiTouchZoomSupportedOnUiThread()); |
- getContentSettingsOnUiThread(mContentViewCore).setSupportZoom(false); |
+ getContentSettingsOnUiThread(mAwContents).setSupportZoom(false); |
assertFalse(isMultiTouchZoomSupportedOnUiThread()); |
} |
@@ -255,8 +259,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { |
*/ |
@FlakyTest |
public void testZoomControls() throws Throwable { |
- ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore); |
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), |
+ ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents); |
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |
getZoomableHtml(), "text/html", false); |
assertTrue(webSettings.supportZoom()); |
@@ -279,8 +283,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { |
@SmallTest |
@Feature({"Android-WebView"}) |
public void testZoomControlsOnNonZoomableContent() throws Throwable { |
- ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore); |
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), |
+ ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents); |
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |
getNonZoomableHtml(), "text/html", false); |
// ContentView must update itself according to the viewport setup. |
@@ -302,8 +306,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase { |
*/ |
@DisabledTest |
public void testZoomControlsOnOrientationChange() throws Throwable { |
- ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore); |
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), |
+ ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents); |
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), |
getZoomableHtml(), "text/html", false); |
assertTrue(webSettings.supportZoom()); |