Index: android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java |
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java |
index ffac55a508a53f4f7aed5593d5f1d18d195a08e4..0fc0282adf5f119e2f082cae382899f38d9903d0 100644 |
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java |
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java |
@@ -14,6 +14,7 @@ import android.net.Proxy; |
import android.test.mock.MockContext; |
import android.test.suitebuilder.annotation.SmallTest; |
+import org.chromium.android_webview.AwContents; |
import org.chromium.base.test.util.DisabledTest; |
import org.chromium.base.test.util.Feature; |
import org.chromium.base.ThreadUtils; |
@@ -31,14 +32,17 @@ import java.util.concurrent.Callable; |
public class ContentViewMiscTest extends AndroidWebViewTestBase { |
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(); |
} |
/** |
@@ -53,7 +57,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase { |
.append("</body></html>"); |
// Test flinging in the y axis |
- loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), |
+ loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), |
testPage.toString()); |
assertEquals(0, mContentViewCore.getNativeScrollYForTest()); |
ThreadUtils.runOnUiThread(new Runnable() { |
@@ -151,7 +155,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase { |
*/ |
@DisabledTest |
public void testSetGetBackgroundColor() throws Throwable { |
- loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), "about:blank"); |
+ loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), "about:blank"); |
ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
@Override |
public void run() { |