summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 14:27:56 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 14:27:56 +0000
commitc204ff5c7869a0db2ecc9b9722aabe5b85e1d998 (patch)
tree6cf209045fa22b7c56c4a8aac819290f13a7ad20
parentfc6d081efc78e8189c89f1b9fdbfa5a71105d4c2 (diff)
downloadchromium_src-c204ff5c7869a0db2ecc9b9722aabe5b85e1d998.zip
chromium_src-c204ff5c7869a0db2ecc9b9722aabe5b85e1d998.tar.gz
chromium_src-c204ff5c7869a0db2ecc9b9722aabe5b85e1d998.tar.bz2
[android_webview] Use AwContents loadUrl method instead of ContentViewCore.
This introduces a loadUrl method on AwContents and modifies all of our test code to use that method instead of the on ContentViewCore. BUG=154558 Java-only change, ran through android FYI. NOTRY=true Review URL: https://codereview.chromium.org/11028094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContents.java12
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java31
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java50
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java8
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java21
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java510
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java128
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java9
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java23
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java17
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java18
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java12
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java32
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java27
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java17
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java46
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java46
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java13
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java2
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java44
20 files changed, 566 insertions, 500 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index b7995fd..2a7377b 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -18,6 +18,7 @@ import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils;
import org.chromium.chrome.browser.component.navigation_interception.InterceptNavigationDelegate;
import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.LoadUrlParams;
import org.chromium.content.browser.NavigationHistory;
import org.chromium.content.common.CleanupReference;
import org.chromium.net.X509Util;
@@ -185,6 +186,17 @@ public class AwContents {
return null;
}
+ /**
+ * Load url without fixing up the url string. Consumers of ContentView are responsible for
+ * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
+ * off during user input).
+ *
+ * @param pararms Parameters for this load.
+ */
+ public void loadUrl(LoadUrlParams params) {
+ mContentViewCore.loadUrl(params);
+ }
+
//--------------------------------------------------------------------------------------------
// WebView[Provider] method implementations (where not provided by ContentViewCore)
//--------------------------------------------------------------------------------------------
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
index ea2c6c7..466d714 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
@@ -9,8 +9,8 @@ import android.test.suitebuilder.annotation.SmallTest;
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,11 +31,12 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
"<html><head><title>" + expectedTitle + "</title></head><body>foo</body></html>";
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,
"text/html", false);
- assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -46,18 +47,19 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
"L2hlYWQ+PC9odG1sPg==";
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,
"text/html", true);
- assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
}
/**
* Loads url on the UI thread and blocks until onPageFinished is called.
*/
protected void loadUrlWithExtraHeadersSync(
- final ContentViewCore contentViewCore,
+ final AwContents awContents,
CallbackHelper onPageFinishedHelper,
final String url,
final Map<String, String> extraHeaders) throws Throwable {
@@ -67,7 +69,7 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
public void run() {
LoadUrlParams params = new LoadUrlParams(url);
params.setExtraHeaders(extraHeaders);
- contentViewCore.loadUrl(params);
+ awContents.loadUrl(params);
}
});
onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
@@ -78,8 +80,9 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView"})
public void testLoadUrlWithExtraHeaders() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestWebServer webServer = null;
try {
@@ -93,7 +96,7 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
for (int i = 0; i < headerNames.length; ++i)
extraHeaders.put(headerNames[i], headerValues[i]);
- loadUrlWithExtraHeadersSync(contentViewCore,
+ loadUrlWithExtraHeadersSync(awContents,
contentsClient.getOnPageFinishedHelper(),
url,
extraHeaders);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 44b5b12..9f911f7 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -74,11 +74,11 @@ public class AndroidWebViewTestBase
}
}
- protected void enableJavaScriptOnUiThread(final ContentViewCore contentViewCore) {
+ protected void enableJavaScriptOnUiThread(final AwContents awContents) {
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- contentViewCore.getContentSettings().setJavaScriptEnabled(true);
+ awContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
}
});
}
@@ -86,22 +86,22 @@ public class AndroidWebViewTestBase
/**
* Loads url on the UI thread and blocks until onPageFinished is called.
*/
- protected void loadUrlSync(final ContentViewCore contentViewCore,
+ protected void loadUrlSync(final AwContents awContents,
CallbackHelper onPageFinishedHelper,
final String url) throws Throwable {
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadUrlAsync(contentViewCore, url);
+ loadUrlAsync(awContents, url);
onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
TimeUnit.SECONDS);
}
- protected void loadUrlSyncAndExpectError(final ContentViewCore contentViewCore,
+ protected void loadUrlSyncAndExpectError(final AwContents awContents,
CallbackHelper onPageFinishedHelper,
CallbackHelper onReceivedErrorHelper,
final String url) throws Throwable {
int onErrorCallCount = onReceivedErrorHelper.getCallCount();
int onFinishedCallCount = onPageFinishedHelper.getCallCount();
- loadUrlAsync(contentViewCore, url);
+ loadUrlAsync(awContents, url);
onReceivedErrorHelper.waitForCallback(onErrorCallCount, 1, WAIT_TIMEOUT_SECONDS,
TimeUnit.SECONDS);
onPageFinishedHelper.waitForCallback(onFinishedCallCount, 1, WAIT_TIMEOUT_SECONDS,
@@ -111,12 +111,12 @@ public class AndroidWebViewTestBase
/**
* Loads url on the UI thread but does not block.
*/
- protected void loadUrlAsync(final ContentViewCore contentViewCore,
+ protected void loadUrlAsync(final AwContents awContents,
final String url) throws Throwable {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- contentViewCore.loadUrl(new LoadUrlParams(url));
+ awContents.getContentViewCore().loadUrl(new LoadUrlParams(url));
}
});
}
@@ -124,12 +124,12 @@ public class AndroidWebViewTestBase
/**
* Loads data on the UI thread and blocks until onPageFinished is called.
*/
- protected void loadDataSync(final ContentViewCore contentViewCore,
+ protected void loadDataSync(final AwContents awContents,
CallbackHelper onPageFinishedHelper,
final String data, final String mimeType,
final boolean isBase64Encoded) throws Throwable {
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(contentViewCore, data, mimeType, isBase64Encoded);
+ loadDataAsync(awContents, data, mimeType, isBase64Encoded);
onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
TimeUnit.SECONDS);
}
@@ -137,32 +137,32 @@ public class AndroidWebViewTestBase
/**
* Loads data on the UI thread but does not block.
*/
- protected void loadDataAsync(final ContentViewCore contentViewCore, final String data,
+ protected void loadDataAsync(final AwContents awContents, final String data,
final String mimeType, final boolean isBase64Encoded)
throws Throwable {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- contentViewCore.loadUrl(LoadUrlParams.createLoadDataParams(
+ awContents.loadUrl(LoadUrlParams.createLoadDataParams(
data, mimeType, isBase64Encoded));
}
});
}
protected AwTestContainerView createAwTestContainerView(final boolean incognito,
- final AwContentsClient contentsClient) {
+ final AwContentsClient awContentsClient) {
return createAwTestContainerView(incognito, new AwTestContainerView(getActivity()),
- contentsClient);
+ awContentsClient);
}
protected AwTestContainerView createAwTestContainerView(final boolean incognito,
final AwTestContainerView testContainerView,
- final AwContentsClient contentsClient) {
+ final AwContentsClient awContentsClient) {
ContentViewCore contentViewCore = new ContentViewCore(
getActivity(), ContentViewCore.PERSONALITY_VIEW);
testContainerView.initialize(contentViewCore,
new AwContents(testContainerView, testContainerView.getInternalAccessDelegate(),
- contentViewCore, contentsClient, new ActivityNativeWindow(getActivity()),
+ contentViewCore, awContentsClient, new ActivityNativeWindow(getActivity()),
incognito, false));
getActivity().addView(testContainerView);
return testContainerView;
@@ -188,31 +188,31 @@ public class AndroidWebViewTestBase
return testContainerView.get();
}
- protected void destroyAwContentsOnMainSync(final AwContents contents) {
- if (contents == null) return;
+ protected void destroyAwContentsOnMainSync(final AwContents awContents) {
+ if (awContents == null) return;
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- contents.destroy();
+ awContents.destroy();
}
});
}
- protected String getTitleOnUiThread(final ContentViewCore contentViewCore) throws Throwable {
+ protected String getTitleOnUiThread(final AwContents awContents) throws Throwable {
return runTestOnUiThreadAndGetResult(new Callable<String>() {
@Override
public String call() throws Exception {
- return contentViewCore.getTitle();
+ return awContents.getContentViewCore().getTitle();
}
});
}
protected ContentSettings getContentSettingsOnUiThread(
- final ContentViewCore contentViewCore) throws Throwable {
+ final AwContents awContents) throws Throwable {
return runTestOnUiThreadAndGetResult(new Callable<ContentSettings>() {
@Override
public ContentSettings call() throws Exception {
- return contentViewCore.getContentSettings();
+ return awContents.getContentViewCore().getContentSettings();
}
});
}
@@ -231,7 +231,7 @@ public class AndroidWebViewTestBase
* Executes the given snippet of JavaScript code within the given ContentView. Returns the
* result of its execution in JSON format.
*/
- protected String executeJavaScriptAndWaitForResult(final ContentViewCore core,
+ protected String executeJavaScriptAndWaitForResult(final AwContents awContents,
TestAwContentsClient viewClient, final String code) throws Throwable {
final AtomicInteger requestId = new AtomicInteger();
TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper
@@ -240,7 +240,7 @@ public class AndroidWebViewTestBase
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- requestId.set(core.evaluateJavaScript(code));
+ requestId.set(awContents.getContentViewCore().evaluateJavaScript(code));
}
});
onEvaluateJavaScriptResultHelper.waitForCallback(currentCallCount);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
index 05a4074..14b4a55 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
@@ -80,7 +80,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
file.delete();
assertFalse(file.exists());
- loadUrlSync(mTestContainerView.getContentViewCore(),
+ loadUrlSync(mTestContainerView.getAwContents(),
mContentsClient.getOnPageFinishedHelper(), TEST_PAGE);
doArchiveTest(mTestContainerView.getAwContents(), path, false, path);
@@ -91,7 +91,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
public void testAutoGoodPath() throws Throwable {
final String path = getActivity().getFilesDir().getAbsolutePath() + "/";
- loadUrlSync(mTestContainerView.getContentViewCore(),
+ loadUrlSync(mTestContainerView.getAwContents(),
mContentsClient.getOnPageFinishedHelper(), TEST_PAGE);
// Create the first archive
@@ -115,7 +115,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
file.delete();
assertFalse(file.exists());
- loadUrlSync(mTestContainerView.getContentViewCore(),
+ loadUrlSync(mTestContainerView.getAwContents(),
mContentsClient.getOnPageFinishedHelper(), TEST_PAGE);
doArchiveTest(mTestContainerView.getAwContents(), path, false, null);
@@ -129,7 +129,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
file.delete();
assertFalse(file.exists());
- loadUrlSync(mTestContainerView.getContentViewCore(),
+ loadUrlSync(mTestContainerView.getAwContents(),
mContentsClient.getOnPageFinishedHelper(), TEST_PAGE);
doArchiveTest(mTestContainerView.getAwContents(), path, true, null);
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 bfcfce6..17065cf1 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
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 bb73435..07b7998 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
@@ -7,7 +7,6 @@ package org.chromium.android_webview.test;
import android.content.Context;
import android.os.Build;
import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Pair;
import org.chromium.android_webview.AndroidProtocolHandler;
import org.chromium.android_webview.AwContents;
@@ -50,16 +49,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
* In this case, requiresJsEnabled constructor argument must be set to true.
*/
abstract class AwSettingsTestHelper<T> {
- protected final ContentViewCore mContentViewCore;
+ protected final AwContents mAwContents;
protected final TestAwContentsClient mContentViewClient;
protected final ContentSettings mContentSettings;
- AwSettingsTestHelper(ContentViewCore contentViewCore,
+ AwSettingsTestHelper(AwContents awContents,
TestAwContentsClient contentViewClient,
boolean requiresJsEnabled) throws Throwable {
- mContentViewCore = contentViewCore;
+ mAwContents = awContents;
mContentViewClient = contentViewClient;
- mContentSettings = getContentSettingsOnUiThread(mContentViewCore);
+ mContentSettings = getContentSettingsOnUiThread(mAwContents);
if (requiresJsEnabled) {
mContentSettings.setJavaScriptEnabled(true);
}
@@ -92,12 +91,12 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected abstract void doEnsureSettingHasValue(T value) throws Throwable;
protected String getTitleOnUiThread() throws Throwable {
- return AwSettingsTest.this.getTitleOnUiThread(mContentViewCore);
+ return AwSettingsTest.this.getTitleOnUiThread(mAwContents);
}
protected void loadDataSync(String data) throws Throwable {
AwSettingsTest.this.loadDataSync(
- mContentViewCore,
+ mAwContents,
mContentViewClient.getOnPageFinishedHelper(),
data,
"text/html",
@@ -106,14 +105,14 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected void loadUrlSync(String url) throws Throwable {
AwSettingsTest.this.loadUrlSync(
- mContentViewCore,
+ mAwContents,
mContentViewClient.getOnPageFinishedHelper(),
url);
}
protected void loadUrlSyncAndExpectError(String url) throws Throwable {
AwSettingsTest.this.loadUrlSyncAndExpectError(
- mContentViewCore,
+ mAwContents,
mContentViewClient.getOnPageFinishedHelper(),
mContentViewClient.getOnReceivedErrorHelper(),
url);
@@ -129,9 +128,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String JS_ENABLED_STRING = "JS Enabled";
private static final String JS_DISABLED_STRING = "JS Disabled";
- AwSettingsJavaScriptTestHelper(ContentViewCore contentViewCore,
+ AwSettingsJavaScriptTestHelper(AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, false);
+ super(awContents, contentViewClient, false);
}
@Override
@@ -173,9 +172,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// JavaScript state.
class AwSettingsJavaScriptDynamicTestHelper extends AwSettingsJavaScriptTestHelper {
AwSettingsJavaScriptDynamicTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient);
+ super(awContents, contentViewClient);
// Load the page.
super.doEnsureSettingHasValue(getInitialValue());
}
@@ -185,7 +184,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
String oldTitle = getTitleOnUiThread();
String newTitle = oldTitle + "_modified";
executeJavaScriptAndWaitForResult(
- mContentViewCore, mContentViewClient, getScript(newTitle));
+ mAwContents, mContentViewClient, getScript(newTitle));
assertEquals(value == ENABLED ? newTitle : oldTitle, getTitleOnUiThread());
}
@@ -198,9 +197,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String PLUGINS_ENABLED_STRING = "Embed";
private static final String PLUGINS_DISABLED_STRING = "NoEmbed";
- AwSettingsPluginsTestHelper(ContentViewCore contentViewCore,
+ AwSettingsPluginsTestHelper(AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -239,9 +238,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsStandardFontFamilyTestHelper extends AwSettingsTestHelper<String> {
AwSettingsStandardFontFamilyTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -279,9 +278,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsDefaultFontSizeTestHelper extends AwSettingsTestHelper<Integer> {
AwSettingsDefaultFontSizeTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -321,10 +320,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private ImagePageGenerator mGenerator;
AwSettingsLoadImagesAutomaticallyTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
ImagePageGenerator generator) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mGenerator = generator;
}
@@ -360,9 +359,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<String> {
AwSettingsDefaultTextEncodingTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -402,9 +401,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String CUSTOM_UA = "ChromeViewTest";
AwSettingsUserAgentStringTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mDefaultUa = mContentSettings.getUserAgentString();
}
@@ -452,9 +451,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String HAS_LOCAL_STORAGE = "Has localStorage";
AwSettingsDomStorageEnabledTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -494,9 +493,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsUniversalAccessFromFilesTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
// The value of the setting depends on the SDK version.
@@ -545,9 +544,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsFileAccessFromFilesIframeTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
@@ -592,9 +591,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "Exception";
AwSettingsFileAccessFromFilesXhrTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mXhrContainerUrl = UrlUtils.getTestFileUrl("webview/xhr_access.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
// The value of the setting depends on the SDK version.
@@ -637,12 +636,11 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected AwSettings mAwSettings;
AwSettingsWithSettingsTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
boolean requiresJsEnabled) throws Throwable {
- super(containerView.getContentViewCore(), contentViewClient, requiresJsEnabled);
- mAwSettings =
- AwSettingsTest.this.getAwSettingsOnUiThread(containerView.getAwContents());
+ super(awContents, contentViewClient, requiresJsEnabled);
+ mAwSettings = AwSettingsTest.this.getAwSettingsOnUiThread(awContents);
}
}
@@ -650,10 +648,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_GRANTED_TITLE = "Hello, World!";
AwSettingsFileUrlAccessTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
int startIndex) throws Throwable {
- super(containerView, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIndex = startIndex;
}
@@ -706,10 +704,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsContentUrlAccessTestHelper extends AwSettingsWithSettingsTestHelper<Boolean> {
AwSettingsContentUrlAccessTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
int index) throws Throwable {
- super(containerView, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mTarget = "content_access_" + index;
}
@@ -752,10 +750,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String TARGET = "content_from_file";
AwSettingsContentUrlAccessFromFileTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
int index) throws Throwable {
- super(containerView, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIndex = index;
mTempDir = getInstrumentation().getTargetContext().getCacheDir().getPath();
}
@@ -824,15 +822,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
+ "</head><body onload=\"document.title='" + JS_ENABLED_STRING
+ "';\"></body></html>";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
loadDataSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
TEST_PAGE_HTML,
"text/html",
false);
- assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(contentView));
+ assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -840,8 +839,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -849,8 +848,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -858,8 +857,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -867,8 +866,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -876,8 +875,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -885,8 +884,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -894,8 +893,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -903,8 +902,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -912,8 +911,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -921,8 +920,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -930,8 +929,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -939,8 +938,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -948,8 +947,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -957,8 +956,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -966,8 +965,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
}
// The test verifies that disabling images loading by setting
@@ -978,63 +977,67 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@SmallTest
public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
- ContentSettings settings0 = getContentSettingsOnUiThread(views.getView0());
+ ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
settings0.setJavaScriptEnabled(true);
- ContentSettings settings1 = getContentSettingsOnUiThread(views.getView1());
+ ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
settings1.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
// First disable images loading and verify it.
settings0.setLoadsImagesAutomatically(false);
settings1.setLoadsImagesAutomatically(false);
- loadDataSync(views.getView0(),
+ loadDataSync(views.getContents0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getView0()));
+ getTitleOnUiThread(views.getContents0()));
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getView1()));
+ getTitleOnUiThread(views.getContents1()));
// Now enable images loading only for view 0.
settings0.setLoadsImagesAutomatically(true);
- loadDataSync(views.getView0(),
+ loadDataSync(views.getContents0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
// Once the image has been cached by contentView0, it is available to contentView1.
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents1()));
ImagePageGenerator generator1 = new ImagePageGenerator(1, false);
// This is a new image. view 1 can't load it.
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getView1()));
- loadDataSync(views.getView0(),
+ getTitleOnUiThread(views.getContents1()));
+ loadDataSync(views.getContents0(),
views.getClient0().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
// Once the image has been cached by contentViewCore0, it is available to contentViewCore1.
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents1()));
}
// The test verifies that after changing the LoadsImagesAutomatically
@@ -1044,26 +1047,27 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setLoadsImagesAutomatically(false);
- loadDataSync(contentView,
+ loadDataSync(awContents,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
settings.setLoadsImagesAutomatically(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
try {
return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUiThread: " + t.toString());
@@ -1071,7 +1075,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
}
}
}, TEST_TIMEOUT, CHECK_INTERVAL));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -1080,9 +1084,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1091,9 +1095,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1102,9 +1106,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1112,8 +1116,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1121,8 +1125,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1130,8 +1134,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
}
// The test verifies that the default user agent string follows the format
@@ -1144,9 +1148,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringDefault() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
final String actualUserAgentString = settings.getUserAgentString();
final String patternString =
"Mozilla/5\\.0 \\(Linux;( U;)? Android ([^;]+);( (\\w+)-(\\w+);)?" +
@@ -1172,9 +1177,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverride() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
final String defaultUserAgentString = settings.getUserAgentString();
// Check that an attempt to reset the default UA string has no effect.
@@ -1201,10 +1207,12 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverrideForHistory() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView = testContainerView.getContentViewCore();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
final String defaultUserAgentString = settings.getUserAgentString();
final String customUserAgentString = "ContentSettingsTest";
@@ -1220,19 +1228,19 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String page2 = String.format(pageTemplate, page2Title);
settings.setUserAgentString(customUserAgentString);
loadDataSync(
- contentView, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
- assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(contentView));
+ awContents, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
+ assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(awContents));
loadDataSync(
- contentView, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
+ awContents, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
settings.setUserAgentString(null);
// Must not cause any changes until the next page loading.
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
HistoryUtils.goBackSync(getInstrumentation(), contentView, onPageFinishedHelper);
- assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(contentView));
+ assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(awContents));
HistoryUtils.goForwardSync(getInstrumentation(), contentView,
onPageFinishedHelper);
- assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(contentView));
+ assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -1240,8 +1248,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1249,8 +1257,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1258,8 +1266,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1267,8 +1275,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1276,8 +1284,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1285,8 +1293,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1294,8 +1302,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1303,8 +1313,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1312,8 +1324,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+ views.getClient1()));
}
// This test verifies that local image resources can be loaded from file:
@@ -1324,14 +1338,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
final String imageHeight = "16";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
settings.setAllowUniversalAccessFromFileURLs(false);
settings.setAllowFileAccessFromFileURLs(false);
- loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
- assertEquals(imageHeight, getTitleOnUiThread(contentView));
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
+ assertEquals(imageHeight, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -1340,9 +1355,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView0(), views.getClient0()),
+ views.getContents0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView1(), views.getClient1()));
+ views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1351,9 +1366,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView0(), views.getClient0()),
+ views.getContents0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView1(), views.getClient1()));
+ views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1362,9 +1377,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView0(), views.getClient0()),
+ views.getContents0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView1(), views.getClient1()));
+ views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1372,8 +1387,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1381,8 +1398,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1390,8 +1409,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1399,8 +1420,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1408,8 +1429,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1417,8 +1438,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1426,8 +1447,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1435,8 +1456,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1444,16 +1465,17 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@Feature({"Android-WebView", "Preferences", "Navigation"})
public void testBlockingContentUrlsFromDataUrls() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
final String target = "content_from_data";
final String page = "<html><body>" +
"<img src=\"" +
@@ -1461,7 +1483,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
"</body></html>";
resetResourceRequestCountInContentProvider(target);
loadDataSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
page,
"text/html",
@@ -1475,9 +1497,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer0(), views.getClient0(), 0),
+ views.getContents0(), views.getClient0(), 0),
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer1(), views.getClient1(), 1));
+ views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1486,9 +1508,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer0(), views.getClient0(), 0),
+ views.getContents0(), views.getClient0(), 0),
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer1(), views.getClient1(), 1));
+ views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1497,37 +1519,39 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer0(), views.getClient0(), 0),
+ views.getContents0(), views.getClient0(), 0),
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer1(), views.getClient1(), 1));
+ views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- final ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentSettings settings = getContentSettingsOnUiThread(awContents);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setJavaScriptEnabled(true);
settings.setImagesEnabled(false);
- loadDataSync(contentView,
+ loadDataSync(awContents,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html",
false);
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
}
@SmallTest
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- final ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1543,9 +1567,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String httpImageUrl = webServer.setResponse(pagePath, httpUrlImageHtml, null);
settings.setImagesEnabled(false);
- loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), httpImageUrl);
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), httpImageUrl);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
settings.setImagesEnabled(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@@ -1553,7 +1577,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public boolean isSatisfied() {
try {
return ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUIThread: " + t.toString());
@@ -1574,14 +1598,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
try {
useTestResourceContext();
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
@@ -1595,14 +1620,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
try {
useTestResourceContext();
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
@@ -1616,17 +1642,17 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView containerView =
- createAwTestContainerViewOnMainSync(false, contentClient);
- final ContentViewCore contentView = containerView.getContentViewCore();
- final AwSettings settings = getAwSettingsOnUiThread(containerView.getAwContents());
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final AwSettings settings = getAwSettingsOnUiThread(awContents);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
@@ -1640,59 +1666,51 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView containerView =
- createAwTestContainerViewOnMainSync(false, contentClient);
- final ContentViewCore contentView = containerView.getContentViewCore();
- final AwSettings settings = getAwSettingsOnUiThread(containerView.getAwContents());
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final AwSettings settings = getAwSettingsOnUiThread(awContents);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
}
class ViewPair {
- ViewPair(AwTestContainerView container0, TestAwContentsClient client0,
- AwTestContainerView container1, TestAwContentsClient client1) {
- this.container0 = container0;
+ private final AwContents contents0;
+ private final TestAwContentsClient client0;
+ private final AwContents contents1;
+ private final TestAwContentsClient client1;
+
+ ViewPair(AwContents contents0, TestAwContentsClient client0,
+ AwContents contents1, TestAwContentsClient client1) {
+ this.contents0 = contents0;
this.client0 = client0;
- this.container1 = container1;
+ this.contents1 = contents1;
this.client1 = client1;
}
- AwTestContainerView getContainer0() {
- return container0;
- }
-
- ContentViewCore getView0() {
- return container0.getContentViewCore();
+ AwContents getContents0() {
+ return contents0;
}
TestAwContentsClient getClient0() {
return client0;
}
- AwTestContainerView getContainer1() {
- return container1;
- }
-
- ContentViewCore getView1() {
- return container1.getContentViewCore();
+ AwContents getContents1() {
+ return contents1;
}
TestAwContentsClient getClient1() {
return client1;
}
-
- private final AwTestContainerView container0;
- private final TestAwContentsClient client0;
- private final AwTestContainerView container1;
- private final TestAwContentsClient client1;
}
/**
@@ -1750,9 +1768,11 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
TestAwContentsClient client0 = new TestAwContentsClient();
TestAwContentsClient client1 = new TestAwContentsClient();
return new ViewPair(
- createAwTestContainerViewOnMainSync(firstIsIncognito, client0),
+ createAwTestContainerViewOnMainSync(
+ firstIsIncognito, client0).getAwContents(),
client0,
- createAwTestContainerViewOnMainSync(secondIsIncognito, client1),
+ createAwTestContainerViewOnMainSync(
+ secondIsIncognito, client1).getAwContents(),
client1);
}
@@ -1797,8 +1817,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final TestAwContentsClient contentClient = new TestAwContentsClient();
final AwTestContainerView testContainer =
createAwTestContainerViewOnMainSync(false, contentClient);
- final ContentViewCore contentView = testContainer.getContentViewCore();
- final ContentSettings contentSettings = getContentSettingsOnUiThread(contentView);
+ final AwContents awContents = testContainer.getAwContents();
+ final ContentSettings contentSettings = getContentSettingsOnUiThread(awContents);
final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
contentSettings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1825,20 +1845,20 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// Actual test. Blocking should trigger onerror handler.
awSettings.setBlockNetworkLoads(true);
loadUrlSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(0, webServer.getRequestCount(httpPath));
- assertEquals("img_onerror_fired", getTitleOnUiThread(contentView));
+ assertEquals("img_onerror_fired", getTitleOnUiThread(awContents));
// Unblock should load normally.
awSettings.setBlockNetworkLoads(false);
loadUrlSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(1, webServer.getRequestCount(httpPath));
- assertEquals("img_onload_fired", getTitleOnUiThread(contentView));
+ assertEquals("img_onload_fired", getTitleOnUiThread(awContents));
} finally {
if (fileName != null) TestFileUtil.deleteFile(fileName);
if (webServer != null) webServer.shutdown();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java
index 053fe75..99d4640 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java
@@ -11,10 +11,10 @@ import android.util.Pair;
import android.view.MotionEvent;
import android.util.Log;
+import org.chromium.android_webview.AwContents;
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.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;
@@ -92,15 +92,15 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
}
}
- private void clickOnLinkUsingJs(final ContentViewCore contentViewCore,
+ private void clickOnLinkUsingJs(final AwContents awContents,
final TestAwContentsClient contentsClient) throws Throwable {
- enableJavaScriptOnUiThread(contentViewCore);
+ enableJavaScriptOnUiThread(awContents);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
try {
- String linkIsNotNull = executeJavaScriptAndWaitForResult(contentViewCore,
+ String linkIsNotNull = executeJavaScriptAndWaitForResult(awContents,
contentsClient, "document.getElementById('link') != null");
return linkIsNotNull.equals("true");
} catch (Throwable t) {
@@ -114,7 +114,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- contentViewCore.evaluateJavaScript(
+ awContents.getContentViewCore().evaluateJavaScript(
"var evObj = document.createEvent('Events'); " +
"evObj.initEvent('click', true, false); " +
"document.getElementById('link').dispatchEvent(evObj);" +
@@ -209,12 +209,13 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@DisabledTest
public void testShouldIgnoreNavigationNotCalledOnLoadUrl() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
assertEquals(0, shouldIgnoreNavigationHelper.getCallCount());
@@ -228,17 +229,18 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@DisabledTest
public void testShouldIgnoreNavigationCantBlockLoads() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
- assertEquals("Title", getTitleOnUiThread(contentViewCore));
+ assertEquals("Title", getTitleOnUiThread(awContents));
}
/**
@@ -249,19 +251,20 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@DisabledTest
public void testShouldIgnoreNavigationCalledBeforeOnPageStarted() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
OnPageStartedHelper onPageStartedHelper = contentsClient.getOnPageStartedHelper();
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
final int shouldIgnoreNavigationCallCount = shouldIgnoreNavigationHelper.getCallCount();
final int onPageStartedCallCount = onPageStartedHelper.getCallCount();
setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(shouldIgnoreNavigationCallCount);
assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());
@@ -276,21 +279,22 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@DisabledTest
public void testShouldIgnoreNavigationDoesNotCauseOnReceivedError() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
final TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
OnReceivedErrorHelper onReceivedErrorHelper = contentsClient.getOnReceivedErrorHelper();
final int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
final int shouldIgnoreNavigationCallCount = shouldIgnoreNavigationHelper.getCallCount();
setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(shouldIgnoreNavigationCallCount);
@@ -298,7 +302,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// After we load this URL we're certain that any in-flight callbacks for the previous
// navigation have been delivered.
- loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), ABOUT_BLANK_URL);
+ loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ABOUT_BLANK_URL);
assertEquals(onReceivedErrorCallCount, onReceivedErrorHelper.getCallCount());
}
@@ -308,18 +312,19 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Navigation"})
public void testShouldIgnoreNavigationCalledWhenLinkClicked() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
// We can't go to about:blank from here because we'd get a cross-origin error.
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(callCount);
}
@@ -329,8 +334,9 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Navigation"})
public void testShouldIgnoreNavigationCalledWhenSelfLinkClicked() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
@@ -343,12 +349,12 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
addPageToTestServer(webServer, httpPath,
getHtmlForPageWithSimpleLinkTo(httpPathOnServer));
- loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
httpPathOnServer);
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(callCount);
assertEquals(httpPathOnServer,
@@ -363,9 +369,10 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
public void testShouldIgnoreNavigationCalledWhenNavigatingFromJavaScriptUsingAssign()
throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
- enableJavaScriptOnUiThread(contentViewCore);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ enableJavaScriptOnUiThread(awContents);
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
@@ -374,12 +381,12 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// Set up the HTML page.
webServer = new TestWebServer(false);
final String redirectTargetUrl = createRedirectTargetPage(webServer);
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithJsAssignLinkTo(redirectTargetUrl), "text/html", false);
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(callCount);
} finally {
@@ -392,9 +399,10 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
public void testShouldIgnoreNavigationCalledWhenNavigatingFromJavaScriptUsingReplace()
throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
- enableJavaScriptOnUiThread(contentViewCore);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ enableJavaScriptOnUiThread(awContents);
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
@@ -403,11 +411,11 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// Set up the HTML page.
webServer = new TestWebServer(false);
final String redirectTargetUrl = createRedirectTargetPage(webServer);
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithJsReplaceLinkTo(redirectTargetUrl), "text/html", false);
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(callCount);
} finally {
if (webServer != null) webServer.shutdown();
@@ -418,8 +426,9 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Navigation"})
public void testShouldIgnoreNavigationPassesCorrectUrl() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
@@ -428,11 +437,11 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// Set up the HTML page.
webServer = new TestWebServer(false);
final String redirectTargetUrl = createRedirectTargetPage(webServer);
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false);
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(callCount);
assertEquals(redirectTargetUrl,
shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl());
@@ -445,8 +454,9 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Navigation"})
public void testShouldIgnoreNavigationCanOverrideLoading() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
final TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
@@ -455,7 +465,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// Set up the HTML page.
webServer = new TestWebServer(false);
final String redirectTargetUrl = createRedirectTargetPage(webServer);
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false);
setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
@@ -463,7 +473,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
OnPageFinishedHelper onPageFinishedHelper = contentsClient.getOnPageFinishedHelper();
int onPageFinishedCountBeforeClickingOnLink = onPageFinishedHelper.getCallCount();
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
// Some time around here true should be returned from the shouldIgnoreNavigation
// callback causing the navigation caused by calling clickOnLinkUsingJs to be ignored.
// We validate this by indirectly checking that an onPageFinished callback was not
@@ -473,7 +483,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, false);
final String synchronizationUrl = ABOUT_BLANK_URL;
- loadUrlSync(contentViewCore, onPageFinishedHelper, synchronizationUrl);
+ loadUrlSync(awContents, onPageFinishedHelper, synchronizationUrl);
assertEquals(synchronizationUrl, onPageFinishedHelper.getUrl());
assertEquals(onPageFinishedHelper.getCallCount(),
@@ -491,15 +501,16 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
"PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC90aXRsZT48" +
"L2hlYWQ+PC9odG1sPg==";
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
- loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
getHtmlForPageWithSimpleLinkTo(dataUrl), "text/html", false);
int callCount = shouldIgnoreNavigationHelper.getCallCount();
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(callCount);
assertTrue("Expected URL that starts with 'data:' but got: <" +
@@ -526,17 +537,18 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
private void doTestShouldIgnoreNavigationCalledOnRedirect(TestWebServer webServer,
String redirectUrl, String redirectTarget) throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
final String pageWithLinkToRedirectUrl = addPageToTestServer(webServer,
"/page_with_link_to_redirect.html",
getHtmlForPageWithSimpleLinkTo(redirectUrl));
- enableJavaScriptOnUiThread(contentViewCore);
+ enableJavaScriptOnUiThread(awContents);
TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
contentsClient.getShouldIgnoreNavigationHelper();
int directLoadCallCount = shouldIgnoreNavigationHelper.getCallCount();
- loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), redirectUrl);
+ loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), redirectUrl);
shouldIgnoreNavigationHelper.waitForCallback(directLoadCallCount, adjustForBug154558(1));
assertEquals(redirectTarget,
@@ -550,7 +562,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// true.
// Both of these should yield the same result which is what we're verifying here.
int indirectLoadCallCount = shouldIgnoreNavigationHelper.getCallCount();
- loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+ loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
pageWithLinkToRedirectUrl);
// We waitForCallback here because we call shouldIgnoreNavigation for URLs that were passed
@@ -559,7 +571,7 @@ public class AwShouldIgnoreNavigationTest extends AndroidWebViewTestBase {
// assertEquals(indirectLoadCallCount, shouldIgnoreNavigationHelper.getCallCount());
shouldIgnoreNavigationHelper.waitForCallback(indirectLoadCallCount, 1);
- clickOnLinkUsingJs(contentViewCore, contentsClient);
+ clickOnLinkUsingJs(awContents, contentsClient);
shouldIgnoreNavigationHelper.waitForCallback(indirectLoadCallCount, adjustForBug154558(2));
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
index 3ba0bf4..569a7b8 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
@@ -6,6 +6,7 @@ package org.chromium.android_webview.test;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.android_webview.AwContents;
import org.chromium.base.test.util.Feature;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.HistoryUtils;
@@ -27,12 +28,14 @@ public class ClearHistoryTest extends AndroidWebViewTestBase {
@Feature({"History", "Main"})
public void testClearHistory() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final ContentViewCore contentViewCore =
- createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentsClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentViewCore = testContainerView.getContentViewCore();
OnPageFinishedHelper onPageFinishedHelper = contentsClient.getOnPageFinishedHelper();
for (int i = 0; i < 3; i++) {
- loadUrlSync(contentViewCore, onPageFinishedHelper, URLS[i]);
+ loadUrlSync(awContents, onPageFinishedHelper, URLS[i]);
}
HistoryUtils.goBackSync(getInstrumentation(), contentViewCore, onPageFinishedHelper);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
index f374b79..4c61559 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
@@ -7,9 +7,9 @@ package org.chromium.android_webview.test;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.AwWebContentsDelegate;
import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
/**
* Tests for the ContentViewClient.addMessageToConsole() method.
@@ -24,19 +24,20 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
private static final String TEST_MESSAGE_TWO = "The second test message.";
private TestAwContentsClient mContentsClient;
- private ContentViewCore mContentViewCore;
+ private AwContents mAwContents;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(mContentsClient);
+ mAwContents = testContainerView.getAwContents();
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- mContentViewCore.getContentSettings().setJavaScriptEnabled(true);
+ mAwContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
}
});
}
@@ -63,7 +64,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
mContentsClient.getAddMessageToConsoleHelper();
int callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("error", "msg"),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -71,7 +72,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
addMessageToConsoleHelper.getLevel());
callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("warn", "msg"),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -79,7 +80,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
addMessageToConsoleHelper.getLevel());
callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("log", "msg"),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -97,7 +98,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
mContentsClient.getAddMessageToConsoleHelper();
int callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE),
"text/html", false);
Log.w("test", getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE));
@@ -105,7 +106,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
assertEquals(TEST_MESSAGE_ONE, addMessageToConsoleHelper.getMessage());
callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("log", TEST_MESSAGE_TWO),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -120,7 +121,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
int callCount = addMessageToConsoleHelper.getCallCount();
String data = getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE);
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
data, "text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
assertTrue("Url [" + addMessageToConsoleHelper.getSourceId() + "] expected to end with [" +
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
index 9d9cc16..ff9e660 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
@@ -7,9 +7,9 @@ package org.chromium.android_webview.test;
import android.test.FlakyTest;
import android.test.suitebuilder.annotation.MediumTest;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.test.util.TestWebServer;
import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
/**
@@ -18,14 +18,15 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private ContentViewCore mContentViewCore;
+ private AwContents mAwContents;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(mContentsClient);
+ mAwContents = testContainerView.getAwContents();
}
@MediumTest
@@ -36,7 +37,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
String html = "<html><body>Simple page.</body></html>";
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(mContentViewCore, html, "text/html", false);
+ loadDataAsync(mAwContents, html, "text/html", false);
onPageFinishedHelper.waitForCallback(currentCallCount);
assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl());
@@ -57,7 +58,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
String url = "http://man.id.be.really.surprised.if.this.address.existed.blah/";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
- loadUrlAsync(mContentViewCore, url);
+ loadUrlAsync(mAwContents, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
@@ -83,7 +84,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
assertEquals(0, onPageFinishedHelper.getCallCount());
final int pageWithSubresourcesCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(mContentViewCore,
+ loadDataAsync(mAwContents,
"<html><iframe src=\"" + testPath + "\" /></html>",
"text/html",
false);
@@ -95,7 +96,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
// we get is for the synchronizationUrl we know that the previous load did not schedule
// a callback for the iframe.
final int synchronizationPageCallCount = onPageFinishedHelper.getCallCount();
- loadUrlAsync(mContentViewCore, syncUrl);
+ loadUrlAsync(mAwContents, syncUrl);
onPageFinishedHelper.waitForCallback(synchronizationPageCallCount);
assertEquals(syncUrl, onPageFinishedHelper.getUrl());
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
index a4a2be2..4a99f6a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
@@ -7,6 +7,7 @@ package org.chromium.android_webview.test;
import android.test.FlakyTest;
import android.test.suitebuilder.annotation.MediumTest;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.AndroidProtocolHandler;
import org.chromium.android_webview.ErrorCodeConversionHelper;
import org.chromium.base.test.util.DisabledTest;
@@ -20,14 +21,15 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private ContentViewCore mContentViewCore;
+ private AwContents mAwContents;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(mContentsClient);
+ mAwContents = testContainerView.getAwContents();
}
/*@MediumTest
@@ -41,7 +43,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
String url = "http://man.id.be.really.surprised.if.this.address.existed.blah/";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
- loadUrlAsync(mContentViewCore, url);
+ loadUrlAsync(mAwContents, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_HOST_LOOKUP,
@@ -62,7 +64,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
String url = "foo://some/resource";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
- loadUrlAsync(mContentViewCore, url);
+ loadUrlAsync(mAwContents, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_UNSUPPORTED_SCHEME,
@@ -80,7 +82,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
mContentsClient.getOnPageFinishedHelper();
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(mContentViewCore,
+ loadDataAsync(mAwContents,
"<html><iframe src=\"http//invalid.url.co/\" /></html>",
"text/html",
false);
@@ -98,7 +100,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
final String url = "file:///android_asset/does_not_exist.html";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
useTestResourceContext();
- loadUrlAsync(mContentViewCore, url);
+ loadUrlAsync(mAwContents, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_UNKNOWN,
@@ -119,7 +121,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
final String url = "file:///android_res/raw/does_not_exist.html";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
useTestResourceContext();
- loadUrlAsync(mContentViewCore, url);
+ loadUrlAsync(mAwContents, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_UNKNOWN,
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 ffac55a..0fc0282 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() {
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 b1c6451..9409ff7 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());
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
index 6309296..24f8ded 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
@@ -9,10 +9,10 @@ import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Pair;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.CookieManager;
import org.chromium.android_webview.test.util.TestWebServer;
import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
@@ -31,18 +31,19 @@ import java.util.concurrent.atomic.AtomicInteger;
public class CookieManagerTest extends AndroidWebViewTestBase {
private CookieManager mCookieManager;
- private TestAwContentsClient mContentViewClient;
- private ContentViewCore mContentViewCore;
+ private TestAwContentsClient mContentsClient;
+ private AwContents mAwContents;
@Override
protected void setUp() throws Exception {
super.setUp();
mCookieManager = new CookieManager();
- mContentViewClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentViewClient).getContentViewCore();
- mContentViewCore.getContentSettings().setJavaScriptEnabled(true);
+ mContentsClient = new TestAwContentsClient();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(mContentsClient);
+ mAwContents = testContainerView.getAwContents();
+ mAwContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
assertNotNull(mCookieManager);
}
@@ -72,7 +73,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
assertFalse(mCookieManager.acceptCookie());
assertFalse(mCookieManager.hasCookies());
- loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
setCookie("test1", "value1");
assertNull(mCookieManager.getCookie(url));
@@ -80,14 +81,14 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
responseHeaders.add(
Pair.create("Set-Cookie", "header-test1=header-value1; path=" + path));
url = webServer.setResponse(path, responseStr, responseHeaders);
- loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
assertNull(mCookieManager.getCookie(url));
mCookieManager.setAcceptCookie(true);
assertTrue(mCookieManager.acceptCookie());
url = webServer.setResponse(path, responseStr, null);
- loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
setCookie("test2", "value2");
waitForCookie(url);
String cookie = mCookieManager.getCookie(url);
@@ -98,7 +99,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
responseHeaders.add(
Pair.create("Set-Cookie", "header-test2=header-value2 path=" + path));
url = webServer.setResponse(path, responseStr, responseHeaders);
- loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
waitForCookie(url);
cookie = mCookieManager.getCookie(url);
assertNotNull(cookie);
@@ -114,13 +115,13 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
private void setCookie(final String name, final String value)
throws Throwable {
OnEvaluateJavaScriptResultHelper onEvaluateJavaScriptResultHelper =
- mContentViewClient.getOnEvaluateJavaScriptResultHelper();
+ mContentsClient.getOnEvaluateJavaScriptResultHelper();
int currentCallCount = onEvaluateJavaScriptResultHelper.getCallCount();
final AtomicInteger requestId = new AtomicInteger();
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- requestId.set(mContentViewCore.evaluateJavaScript(
+ requestId.set(mAwContents.getContentViewCore().evaluateJavaScript(
"var expirationDate = new Date();" +
"expirationDate.setDate(expirationDate.getDate() + 5);" +
"document.cookie='" + name + "=" + value +
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
index c157249..366cfcc 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
@@ -7,10 +7,10 @@ package org.chromium.android_webview.test;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Smoke;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.test.util.TestWebServer;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.DisabledTest;
-import org.chromium.content.browser.ContentViewCore;
/**
* A test suite for ContentView.getTitle().
@@ -23,7 +23,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
private static final String GET_TITLE_TEST_NO_TITLE_PATH = "/get_title_test_no_title.html";
private TestAwContentsClient mContentsClient;
- private ContentViewCore mContentViewCore;
+ private AwContents mAwContents;
private static class PageInfo {
public final String mTitle;
@@ -39,8 +39,9 @@ public class GetTitleTest extends AndroidWebViewTestBase {
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(mContentsClient);
+ mAwContents = testContainerView.getAwContents();
}
private static final String getHtml(String title) {
@@ -54,9 +55,9 @@ public class GetTitleTest extends AndroidWebViewTestBase {
}
private String loadFromDataAndGetTitle(String html) throws Throwable {
- loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
html, "text/html", false);
- return getTitleOnUiThread(mContentViewCore);
+ return getTitleOnUiThread(mAwContents);
}
private PageInfo loadFromUrlAndGetTitle(String html, String filename) throws Throwable {
@@ -65,8 +66,8 @@ public class GetTitleTest extends AndroidWebViewTestBase {
webServer = new TestWebServer(false);
final String url = webServer.setResponse(filename, html, null);
- loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), url);
- return new PageInfo(getTitleOnUiThread(mContentViewCore),
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+ return new PageInfo(getTitleOnUiThread(mAwContents),
url.replaceAll("http:\\/\\/", ""));
} finally {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
index 609b62e..7f6e72d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
@@ -6,6 +6,7 @@ package org.chromium.android_webview.test;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.test.util.CommonResources;
import org.chromium.android_webview.test.util.TestWebServer;
import org.chromium.base.test.util.Feature;
@@ -23,14 +24,17 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
protected static int WAIT_TIMEOUT_SECONDS = 15;
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();
}
protected void loadDataWithBaseUrlSync(
@@ -50,7 +54,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- mContentViewCore.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl(
+ mAwContents.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl(
data, mimeType, isBase64Encoded, baseUrl, historyUrl));
}
});
@@ -92,7 +96,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
webServer.setResponseBase64("/" + CommonResources.FAVICON_FILENAME,
CommonResources.FAVICON_DATA_BASE64, CommonResources.getImagePngHeaders(true));
- ContentSettings contentSettings = getContentSettingsOnUiThread(mContentViewCore);
+ ContentSettings contentSettings = getContentSettingsOnUiThread(mAwContents);
contentSettings.setImagesEnabled(true);
contentSettings.setJavaScriptEnabled(true);
@@ -100,7 +104,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
CommonResources.getOnImageLoadedHtml(CommonResources.FAVICON_FILENAME),
"text/html", false, webServer.getBaseUrl(), null);
- assertEquals("5", getTitleOnUiThread(mContentViewCore));
+ assertEquals("5", getTitleOnUiThread(mAwContents));
} finally {
if (webServer != null) webServer.shutdown();
}
@@ -117,9 +121,9 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
CommonResources.getTextJavascriptHeaders(true));
final String pageHtml = getScriptFileTestPageHtml(scriptUrl);
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
loadDataWithBaseUrlSync(pageHtml, "text/html", false, webServer.getBaseUrl(), null);
- assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mContentViewCore));
+ assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mAwContents));
} finally {
if (webServer != null) webServer.shutdown();
@@ -136,9 +140,9 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
CommonResources.ABOUT_HTML, CommonResources.getTextHtmlHeaders(true));
final String html = getCrossOriginAccessTestPageHtml(frameUrl);
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
loadDataWithBaseUrlSync(html, "text/html", false, webServer.getBaseUrl(), null);
- assertEquals(frameUrl, getTitleOnUiThread(mContentViewCore));
+ assertEquals(frameUrl, getTitleOnUiThread(mAwContents));
} finally {
if (webServer != null) webServer.shutdown();
@@ -156,12 +160,12 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
final String html = getCrossOriginAccessTestPageHtml(frameUrl);
final String baseUrl = webServer.getBaseUrl().replaceFirst("localhost", "127.0.0.1");
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
loadDataWithBaseUrlSync(html, "text/html", false, baseUrl, null);
// TODO(mnaganov): Catch a security exception and set the title accordingly,
// once https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed.
- assertEquals("undefined", getTitleOnUiThread(mContentViewCore));
+ assertEquals("undefined", getTitleOnUiThread(mAwContents));
} finally {
if (webServer != null) webServer.shutdown();
@@ -171,11 +175,11 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testNullBaseUrl() throws Throwable {
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
final String pageHtml = "<html><body onload='document.title=document.location.href'>" +
"</body></html>";
loadDataWithBaseUrlSync(pageHtml, "text/html", false, null, null);
- assertEquals("about:blank", getTitleOnUiThread(mContentViewCore));
+ assertEquals("about:blank", getTitleOnUiThread(mAwContents));
}
@SmallTest
@@ -209,23 +213,23 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testAccessToLocalFile() throws Throwable {
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
final String baseUrl = UrlUtils.getTestFileUrl("webview/");
final String scriptFile = baseUrl + "script.js";
final String pageHtml = getScriptFileTestPageHtml(scriptFile);
loadDataWithBaseUrlSync(pageHtml, "text/html", false, baseUrl, null);
- assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mContentViewCore));
+ assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mAwContents));
}
@SmallTest
@Feature({"Android-WebView"})
public void testFailedAccessToLocalFile() throws Throwable {
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
final String scriptFile = UrlUtils.getTestFileUrl("webview/script.js");
final String pageHtml = getScriptFileTestPageHtml(scriptFile);
final String baseUrl = "http://example.com";
loadDataWithBaseUrlSync(pageHtml, "text/html", false, baseUrl, null);
- assertEquals(SCRIPT_NOT_LOADED, getTitleOnUiThread(mContentViewCore));
+ assertEquals(SCRIPT_NOT_LOADED, getTitleOnUiThread(mAwContents));
}
@SmallTest
@@ -242,7 +246,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
"<body>" + page1Title + "</body></html>";
loadDataWithBaseUrlSync(page1Html, "text/html", false, null, historyUrl);
- assertEquals(page1Title, getTitleOnUiThread(mContentViewCore));
+ assertEquals(page1Title, getTitleOnUiThread(mAwContents));
final String page2Title = "Page2";
final String page2Html = "<html><head><title>" + page2Title + "</title>" +
@@ -250,12 +254,12 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
mContentsClient.getOnPageFinishedHelper();
- loadDataSync(mContentViewCore, onPageFinishedHelper, page2Html, "text/html", false);
- assertEquals(page2Title, getTitleOnUiThread(mContentViewCore));
+ loadDataSync(mAwContents, onPageFinishedHelper, page2Html, "text/html", false);
+ assertEquals(page2Title, getTitleOnUiThread(mAwContents));
HistoryUtils.goBackSync(getInstrumentation(), mContentViewCore, onPageFinishedHelper);
// The title of the 'about.html' specified via historyUrl.
- assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mContentViewCore));
+ assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mAwContents));
} finally {
if (webServer != null) webServer.shutdown();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
index 35d6478..30ecd95 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
@@ -7,11 +7,11 @@ package org.chromium.android_webview.test;
import android.test.FlakyTest;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.test.util.CommonResources;
import org.chromium.android_webview.test.util.TestWebServer;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.DisabledTest;
-import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.NavigationEntry;
import org.chromium.content.browser.NavigationHistory;
import org.chromium.content.browser.test.util.HistoryUtils;
@@ -22,22 +22,23 @@ import java.util.concurrent.Callable;
public class NavigationHistoryTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private ContentViewCore mContentViewCore;
+ private AwContents mAwContents;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(mContentsClient);
+ mAwContents = testContainerView.getAwContents();
}
- private NavigationHistory getNavigationHistory(final ContentViewCore contentViewCore)
+ private NavigationHistory getNavigationHistory(final AwContents awContents)
throws Exception {
return ThreadUtils.runOnUiThreadBlocking(new Callable<NavigationHistory>() {
@Override
public NavigationHistory call() {
- return contentViewCore.getNavigationHistory();
+ return awContents.getContentViewCore().getNavigationHistory();
}
});
}
@@ -60,12 +61,12 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
*/
@FlakyTest
public void testNavigateOneUrl() throws Throwable {
- NavigationHistory history = getNavigationHistory(mContentViewCore);
+ NavigationHistory history = getNavigationHistory(mAwContents);
assertEquals(0, history.getEntryCount());
- loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
"chrome://newtab/");
- history = getNavigationHistory(mContentViewCore);
+ history = getNavigationHistory(mAwContents);
checkHistoryItem(history.getEntryAtIndex(0),
"chrome://newtab/#bookmarks",
"chrome://newtab/",
@@ -77,15 +78,15 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
@SmallTest
public void testNavigateTwoUrls() throws Throwable {
- NavigationHistory list = getNavigationHistory(mContentViewCore);
+ NavigationHistory list = getNavigationHistory(mAwContents);
assertEquals(0, list.getEntryCount());
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
mContentsClient.getOnPageFinishedHelper();
- loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://newtab/");
- loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://version");
+ loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://newtab/");
+ loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://version");
- list = getNavigationHistory(mContentViewCore);
+ list = getNavigationHistory(mAwContents);
// Make sure there is a new entry entry the list
assertEquals(2, list.getEntryCount());
@@ -112,13 +113,14 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
public void testNavigateTwoUrlsAndBack() throws Throwable {
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
mContentsClient.getOnPageFinishedHelper();
- NavigationHistory list = getNavigationHistory(mContentViewCore);
+ NavigationHistory list = getNavigationHistory(mAwContents);
assertEquals(0, list.getEntryCount());
- loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://newtab/");
- loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://version");
- HistoryUtils.goBackSync(getInstrumentation(), mContentViewCore, onPageFinishedHelper);
- list = getNavigationHistory(mContentViewCore);
+ loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://newtab/");
+ loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://version");
+ HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getContentViewCore(),
+ onPageFinishedHelper);
+ list = getNavigationHistory(mAwContents);
// Make sure the first entry is still okay
checkHistoryItem(list.getEntryAtIndex(0),
@@ -146,7 +148,7 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
*/
@DisabledTest
public void testFavicon() throws Throwable {
- NavigationHistory list = getNavigationHistory(mContentViewCore);
+ NavigationHistory list = getNavigationHistory(mAwContents);
String url;
TestWebServer webServer = null;
@@ -158,14 +160,14 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
url = webServer.setResponse("/favicon.html", CommonResources.FAVICON_STATIC_HTML, null);
assertEquals(0, list.getEntryCount());
- getContentSettingsOnUiThread(mContentViewCore).setImagesEnabled(true);
- loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), url);
+ getContentSettingsOnUiThread(mAwContents).setImagesEnabled(true);
+ loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
} finally {
if (webServer != null) webServer.shutdown();
}
- list = getNavigationHistory(mContentViewCore);
+ list = getNavigationHistory(mAwContents);
// Make sure the first entry is still okay.
checkHistoryItem(list.getEntryAtIndex(0), url, url, "", false);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
index e2e289d..786b9ed 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.java
@@ -9,20 +9,19 @@ import android.test.suitebuilder.annotation.SmallTest;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.chromium.android_webview.AwContents;
import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
public class UserAgentTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private ContentViewCore mContentViewCore;
+ private AwContents mAwContents;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mContentViewCore =
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
+ mAwContents = createAwTestContainerViewOnMainSync(mContentsClient).getAwContents();
}
/**
@@ -32,16 +31,16 @@ public class UserAgentTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testNoExtraSpaceBeforeBuildName() throws Throwable {
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
loadDataSync(
- mContentViewCore,
+ mAwContents,
mContentsClient.getOnPageFinishedHelper(),
// Spaces are replaced with underscores to avoid consecutive spaces compression.
"<html>" +
"<body onload='document.title=navigator.userAgent.replace(/ /g, \"_\")'></body>" +
"</html>",
"text/html", false);
- final String ua = getTitleOnUiThread(mContentViewCore);
+ final String ua = getTitleOnUiThread(mAwContents);
Matcher matcher = Pattern.compile("Android_[^;]+;_[^_]").matcher(ua);
assertTrue(matcher.find());
}
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
index bdefbfb..dc235179 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
@@ -62,7 +62,7 @@ public class WebViewFindApisTestBase extends AndroidWebViewTestBase {
final AwContents contents =
createAwTestContainerViewOnMainSync(contentsClient).getAwContents();
final String data = "<html><head></head><body>" + html + "</body></html>";
- loadDataSync(contents.getContentViewCore(), contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(contents, contentsClient.getOnPageFinishedHelper(),
data, "text/html", false);
return contents;
}
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
index 4597da4..e679214 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
@@ -11,10 +11,10 @@ package org.chromium.android_webview.test;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.JsPromptResultReceiver;
import org.chromium.android_webview.JsResultReceiver;
import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.CallbackHelper;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -48,12 +48,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- final ContentViewCore contentViewCore = view.getContentViewCore();
+ final AwContents awContents = view.getAwContents();
- enableJavaScriptOnUiThread(contentViewCore);
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
+ enableJavaScriptOnUiThread(awContents);
+ loadDataSync(awContents, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- executeJavaScriptAndWaitForResult(contentViewCore, client,
+ executeJavaScriptAndWaitForResult(awContents, client,
"alert('" + ALERT_TEXT + "')");
assertTrue(callbackCalled.get());
}
@@ -81,12 +81,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- ContentViewCore contentViewCore = view.getContentViewCore();
+ final AwContents awContents = view.getAwContents();
- enableJavaScriptOnUiThread(contentViewCore);
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
+ enableJavaScriptOnUiThread(awContents);
+ loadDataSync(awContents, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- String result = executeJavaScriptAndWaitForResult(contentViewCore, client,
+ String result = executeJavaScriptAndWaitForResult(awContents, client,
"prompt('" + PROMPT_TEXT + "','" + PROMPT_DEFAULT + "')");
assertTrue(called.get());
assertEquals("\"" + PROMPT_RESULT + "\"", result);
@@ -111,12 +111,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- ContentViewCore contentViewCore = view.getContentViewCore();
- enableJavaScriptOnUiThread(contentViewCore);
+ final AwContents awContents = view.getAwContents();
+ enableJavaScriptOnUiThread(awContents);
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
+ loadDataSync(awContents, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- String result = executeJavaScriptAndWaitForResult(contentViewCore, client,
+ String result = executeJavaScriptAndWaitForResult(awContents, client,
"confirm('" + CONFIRM_TEXT + "')");
assertTrue(called.get());
assertEquals("true", result);
@@ -141,12 +141,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- ContentViewCore contentViewCore = view.getContentViewCore();
- enableJavaScriptOnUiThread(contentViewCore);
+ final AwContents awContents = view.getAwContents();
+ enableJavaScriptOnUiThread(awContents);
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
+ loadDataSync(awContents, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- String result = executeJavaScriptAndWaitForResult(contentViewCore, client,
+ String result = executeJavaScriptAndWaitForResult(awContents, client,
"confirm('" + CONFIRM_TEXT + "')");
assertTrue(called.get());
assertEquals("false", result);
@@ -167,16 +167,16 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- ContentViewCore contentViewCore = view.getContentViewCore();
- enableJavaScriptOnUiThread(contentViewCore);
+ final AwContents awContents = view.getAwContents();
+ enableJavaScriptOnUiThread(awContents);
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), BEFORE_UNLOAD_URL,
+ loadDataSync(awContents, client.getOnPageFinishedHelper(), BEFORE_UNLOAD_URL,
"text/html", false);
- enableJavaScriptOnUiThread(contentViewCore);
+ enableJavaScriptOnUiThread(awContents);
// Don't wait synchronously because we don't leave the page.
int currentCallCount = jsBeforeUnloadHelper.getCallCount();
- loadDataAsync(contentViewCore, EMPTY_PAGE, "text/html", false);
+ loadDataAsync(awContents, EMPTY_PAGE, "text/html", false);
jsBeforeUnloadHelper.waitForCallback(currentCallCount);
}
}
generated by cgit v1.1 at 2025-05-29 11:05:50 +0000