android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java - Issue 11098030: Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore.

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java

Issue 11098030: Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContents.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java

===================================================================

--- android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java (revision 160963)

+++ android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java (working copy)

@@ -9,8 +9,8 @@

import org.apache.http.Header;

import org.apache.http.HttpRequest;

-import org.chromium.android_webview.AwContents;

import org.chromium.base.test.util.Feature;

+import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.LoadUrlParams;

import org.chromium.content.browser.test.util.CallbackHelper;

import org.chromium.android_webview.test.util.TestWebServer;

@@ -31,12 +31,11 @@

"<html><head><title>" + expectedTitle + "</title></head><body>foo</body></html>";

final TestAwContentsClient contentsClient = new TestAwContentsClient();

- final AwTestContainerView testContainerView =

- createAwTestContainerViewOnMainSync(contentsClient);

- final AwContents awContents = testContainerView.getAwContents();

- loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,

+ final ContentViewCore contentViewCore =

+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();

+ loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,

"text/html", false);

- assertEquals(expectedTitle, getTitleOnUiThread(awContents));

+ assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));

}

@SmallTest

@@ -47,19 +46,18 @@

"L2hlYWQ+PC9odG1sPg==";

final TestAwContentsClient contentsClient = new TestAwContentsClient();

- final AwTestContainerView testContainerView =

- createAwTestContainerViewOnMainSync(contentsClient);

- final AwContents awContents = testContainerView.getAwContents();

- loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,

+ final ContentViewCore contentViewCore =

+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();

+ loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,

"text/html", true);

- assertEquals(expectedTitle, getTitleOnUiThread(awContents));

+ assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));

}

/**

* Loads url on the UI thread and blocks until onPageFinished is called.

protected void loadUrlWithExtraHeadersSync(

- final AwContents awContents,

+ final ContentViewCore contentViewCore,

CallbackHelper onPageFinishedHelper,

final String url,

final Map<String, String> extraHeaders) throws Throwable {

@@ -69,7 +67,7 @@

public void run() {

LoadUrlParams params = new LoadUrlParams(url);

params.setExtraHeaders(extraHeaders);

- awContents.loadUrl(params);

+ contentViewCore.loadUrl(params);

}

});

onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,

@@ -80,9 +78,8 @@

@Feature({"Android-WebView"})

public void testLoadUrlWithExtraHeaders() throws Throwable {

final TestAwContentsClient contentsClient = new TestAwContentsClient();

- final AwTestContainerView testContainerView =

- createAwTestContainerViewOnMainSync(contentsClient);

- final AwContents awContents = testContainerView.getAwContents();

+ final ContentViewCore contentViewCore =

+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();

TestWebServer webServer = null;

try {

@@ -96,7 +93,7 @@

for (int i = 0; i < headerNames.length; ++i)

extraHeaders.put(headerNames[i], headerValues[i]);

- loadUrlWithExtraHeadersSync(awContents,

+ loadUrlWithExtraHeadersSync(contentViewCore,

contentsClient.getOnPageFinishedHelper(),

url,

extraHeaders);