Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java |
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java |
index bfcfce67b24264be887ee3d67bbcc0c6cb612607..17065cf1de9bd6f4cb981256bc6ff0da7df3e1c9 100644 |
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java |
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java |
@@ -19,7 +19,6 @@ import org.chromium.android_webview.test.util.TestWebServer; |
import org.chromium.base.test.util.DisabledTest; |
import org.chromium.base.test.util.Feature; |
import org.chromium.base.test.util.UrlUtils; |
-import org.chromium.content.browser.ContentViewCore; |
import org.chromium.content.browser.test.util.CallbackHelper; |
import org.chromium.content.browser.test.util.Criteria; |
import org.chromium.content.browser.test.util.CriteriaHelper; |
@@ -83,12 +82,12 @@ public class AwContentsTest extends AndroidWebViewTestBase { |
final String imageDoc = "<head/><body><img/><img/></body>"; |
// Make sure a document that does not have images returns 0 |
- loadDataSync(awContents.getContentViewCore(), loadHelper, emptyDoc, mime, false); |
+ loadDataSync(awContents, loadHelper, emptyDoc, mime, false); |
int result = callDocumentHasImagesSync(awContents); |
assertEquals(0, result); |
// Make sure a document that does have images returns 1 |
- loadDataSync(awContents.getContentViewCore(), loadHelper, imageDoc, mime, false); |
+ loadDataSync(awContents, loadHelper, imageDoc, mime, false); |
result = callDocumentHasImagesSync(awContents); |
assertEquals(1, result); |
} |
@@ -109,7 +108,6 @@ public class AwContentsTest extends AndroidWebViewTestBase { |
final TestAwContentsClient contentClient = new TestAwContentsClient(); |
final AwTestContainerView testContainer = |
createAwTestContainerViewOnMainSync(false, contentClient); |
- final ContentViewCore contentView = testContainer.getContentViewCore(); |
final AwContents awContents = testContainer.getAwContents(); |
TestWebServer webServer = null; |
@@ -125,31 +123,31 @@ public class AwContentsTest extends AndroidWebViewTestBase { |
// First load to populate cache. |
clearCacheOnUiThread(awContents, true); |
- loadUrlSync(contentView, |
+ loadUrlSync(awContents, |
contentClient.getOnPageFinishedHelper(), |
pageUrl); |
assertEquals(1, webServer.getRequestCount(pagePath)); |
// Load about:blank so next load is not treated as reload by webkit and force |
// revalidate with the server. |
- loadUrlSync(contentView, |
+ loadUrlSync(awContents, |
contentClient.getOnPageFinishedHelper(), |
"about:blank"); |
// No clearCache call, so should be loaded from cache. |
- loadUrlSync(contentView, |
+ loadUrlSync(awContents, |
contentClient.getOnPageFinishedHelper(), |
pageUrl); |
assertEquals(1, webServer.getRequestCount(pagePath)); |
// Same as above. |
- loadUrlSync(contentView, |
+ loadUrlSync(awContents, |
contentClient.getOnPageFinishedHelper(), |
"about:blank"); |
// Clear cache, so should hit server again. |
clearCacheOnUiThread(awContents, true); |
- loadUrlSync(contentView, |
+ loadUrlSync(awContents, |
contentClient.getOnPageFinishedHelper(), |
pageUrl); |
assertEquals(2, webServer.getRequestCount(pagePath)); |
@@ -187,7 +185,6 @@ public class AwContentsTest extends AndroidWebViewTestBase { |
public void testGetFavicon() throws Throwable { |
final AwTestContainerView testView = createAwTestContainerViewOnMainSync(mContentsClient); |
final AwContents awContents = testView.getAwContents(); |
- final ContentViewCore contentViewCore = testView.getContentViewCore(); |
TestWebServer webServer = null; |
try { |
@@ -203,8 +200,8 @@ public class AwContentsTest extends AndroidWebViewTestBase { |
// the page load completes which makes it slightly hard to test. |
final Bitmap defaultFavicon = awContents.getFavicon(); |
- getContentSettingsOnUiThread(contentViewCore).setImagesEnabled(true); |
- loadUrlSync(contentViewCore, mContentsClient.getOnPageFinishedHelper(), pageUrl); |
+ getContentSettingsOnUiThread(awContents).setImagesEnabled(true); |
+ loadUrlSync(awContents, mContentsClient.getOnPageFinishedHelper(), pageUrl); |
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() { |
@Override |