summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 23:08:05 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 23:08:05 +0000
commitf28489e7d37218d279b21159e059ecfef72103a5 (patch)
treefdacf5600c2c81728bee59ab0240c81343aa137e /android_webview
parentc157bbc29b11c3d995190eeb9bfe0f043ccd5e0e (diff)
downloadchromium_src-f28489e7d37218d279b21159e059ecfef72103a5.zip
chromium_src-f28489e7d37218d279b21159e059ecfef72103a5.tar.gz
chromium_src-f28489e7d37218d279b21159e059ecfef72103a5.tar.bz2
Revert 160959 - [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 Review URL: https://chromiumcodereview.appspot.com/11028094 TBR=mkosiba@chromium.org Review URL: https://codereview.chromium.org/11098030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-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.java46
-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.java475
-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
19 files changed, 417 insertions, 482 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 a5a9617..377e568 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -18,7 +18,6 @@ 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;
@@ -174,17 +173,6 @@ 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 466d714..ea2c6c7 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,12 +31,11 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
"<html><head><title>" + expectedTitle + "</title></head><body>foo</body></html>";
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentsClient);
- final AwContents awContents = testContainerView.getAwContents();
- loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,
+ final ContentViewCore contentViewCore =
+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,
"text/html", false);
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));
}
@SmallTest
@@ -47,19 +46,18 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
"L2hlYWQ+PC9odG1sPg==";
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentsClient);
- final AwContents awContents = testContainerView.getAwContents();
- loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,
+ final ContentViewCore contentViewCore =
+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+ loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,
"text/html", true);
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));
}
/**
* Loads url on the UI thread and blocks until onPageFinished is called.
*/
protected void loadUrlWithExtraHeadersSync(
- final AwContents awContents,
+ final ContentViewCore contentViewCore,
CallbackHelper onPageFinishedHelper,
final String url,
final Map<String, String> extraHeaders) throws Throwable {
@@ -69,7 +67,7 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
public void run() {
LoadUrlParams params = new LoadUrlParams(url);
params.setExtraHeaders(extraHeaders);
- awContents.loadUrl(params);
+ contentViewCore.loadUrl(params);
}
});
onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
@@ -80,9 +78,8 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView"})
public void testLoadUrlWithExtraHeaders() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentsClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentViewCore =
+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
TestWebServer webServer = null;
try {
@@ -96,7 +93,7 @@ public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
for (int i = 0; i < headerNames.length; ++i)
extraHeaders.put(headerNames[i], headerValues[i]);
- loadUrlWithExtraHeadersSync(awContents,
+ loadUrlWithExtraHeadersSync(contentViewCore,
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 f51847e..211f6dd 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 AwContents awContents) {
+ protected void enableJavaScriptOnUiThread(final ContentViewCore contentViewCore) {
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- awContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
+ contentViewCore.getContentSettings().setJavaScriptEnabled(true);
}
});
}
@@ -86,11 +86,11 @@ public class AndroidWebViewTestBase
/**
* Loads url on the UI thread and blocks until onPageFinished is called.
*/
- protected void loadUrlSync(final AwContents awContents,
+ protected void loadUrlSync(final ContentViewCore contentViewCore,
CallbackHelper onPageFinishedHelper,
final String url) throws Throwable {
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadUrlAsync(awContents, url);
+ loadUrlAsync(contentViewCore, url);
onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
TimeUnit.SECONDS);
}
@@ -98,12 +98,12 @@ public class AndroidWebViewTestBase
/**
* Loads url on the UI thread but does not block.
*/
- protected void loadUrlAsync(final AwContents awContents,
+ protected void loadUrlAsync(final ContentViewCore contentViewCore,
final String url) throws Throwable {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- awContents.getContentViewCore().loadUrl(new LoadUrlParams(url));
+ contentViewCore.loadUrl(new LoadUrlParams(url));
}
});
}
@@ -111,12 +111,12 @@ public class AndroidWebViewTestBase
/**
* Loads data on the UI thread and blocks until onPageFinished is called.
*/
- protected void loadDataSync(final AwContents awContents,
+ protected void loadDataSync(final ContentViewCore contentViewCore,
CallbackHelper onPageFinishedHelper,
final String data, final String mimeType,
final boolean isBase64Encoded) throws Throwable {
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(awContents, data, mimeType, isBase64Encoded);
+ loadDataAsync(contentViewCore, data, mimeType, isBase64Encoded);
onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
TimeUnit.SECONDS);
}
@@ -124,32 +124,32 @@ public class AndroidWebViewTestBase
/**
* Loads data on the UI thread but does not block.
*/
- protected void loadDataAsync(final AwContents awContents, final String data,
+ protected void loadDataAsync(final ContentViewCore contentViewCore, final String data,
final String mimeType, final boolean isBase64Encoded)
throws Throwable {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- awContents.loadUrl(LoadUrlParams.createLoadDataParams(
+ contentViewCore.loadUrl(LoadUrlParams.createLoadDataParams(
data, mimeType, isBase64Encoded));
}
});
}
protected AwTestContainerView createAwTestContainerView(final boolean incognito,
- final AwContentsClient awContentsClient) {
+ final AwContentsClient contentsClient) {
return createAwTestContainerView(incognito, new AwTestContainerView(getActivity()),
- awContentsClient);
+ contentsClient);
}
protected AwTestContainerView createAwTestContainerView(final boolean incognito,
final AwTestContainerView testContainerView,
- final AwContentsClient awContentsClient) {
+ final AwContentsClient contentsClient) {
ContentViewCore contentViewCore = new ContentViewCore(
getActivity(), ContentViewCore.PERSONALITY_VIEW);
testContainerView.initialize(contentViewCore,
new AwContents(testContainerView, testContainerView.getInternalAccessDelegate(),
- contentViewCore, awContentsClient, new ActivityNativeWindow(getActivity()),
+ contentViewCore, contentsClient, new ActivityNativeWindow(getActivity()),
incognito, false));
getActivity().addView(testContainerView);
return testContainerView;
@@ -175,31 +175,31 @@ public class AndroidWebViewTestBase
return testContainerView.get();
}
- protected void destroyAwContentsOnMainSync(final AwContents awContents) {
- if (awContents == null) return;
+ protected void destroyAwContentsOnMainSync(final AwContents contents) {
+ if (contents == null) return;
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- awContents.destroy();
+ contents.destroy();
}
});
}
- protected String getTitleOnUiThread(final AwContents awContents) throws Throwable {
+ protected String getTitleOnUiThread(final ContentViewCore contentViewCore) throws Throwable {
return runTestOnUiThreadAndGetResult(new Callable<String>() {
@Override
public String call() throws Exception {
- return awContents.getContentViewCore().getTitle();
+ return contentViewCore.getTitle();
}
});
}
protected ContentSettings getContentSettingsOnUiThread(
- final AwContents awContents) throws Throwable {
+ final ContentViewCore contentViewCore) throws Throwable {
return runTestOnUiThreadAndGetResult(new Callable<ContentSettings>() {
@Override
public ContentSettings call() throws Exception {
- return awContents.getContentViewCore().getContentSettings();
+ return contentViewCore.getContentSettings();
}
});
}
@@ -218,7 +218,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 AwContents awContents,
+ protected String executeJavaScriptAndWaitForResult(final ContentViewCore core,
TestAwContentsClient viewClient, final String code) throws Throwable {
final AtomicInteger requestId = new AtomicInteger();
TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper
@@ -227,7 +227,7 @@ public class AndroidWebViewTestBase
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- requestId.set(awContents.getContentViewCore().evaluateJavaScript(code));
+ requestId.set(core.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 14b4a55..05a4074 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.getAwContents(),
+ loadUrlSync(mTestContainerView.getContentViewCore(),
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.getAwContents(),
+ loadUrlSync(mTestContainerView.getContentViewCore(),
mContentsClient.getOnPageFinishedHelper(), TEST_PAGE);
// Create the first archive
@@ -115,7 +115,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
file.delete();
assertFalse(file.exists());
- loadUrlSync(mTestContainerView.getAwContents(),
+ loadUrlSync(mTestContainerView.getContentViewCore(),
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.getAwContents(),
+ loadUrlSync(mTestContainerView.getContentViewCore(),
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 17065cf1..bfcfce6 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,6 +19,7 @@ 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;
@@ -82,12 +83,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, loadHelper, emptyDoc, mime, false);
+ loadDataSync(awContents.getContentViewCore(), loadHelper, emptyDoc, mime, false);
int result = callDocumentHasImagesSync(awContents);
assertEquals(0, result);
// Make sure a document that does have images returns 1
- loadDataSync(awContents, loadHelper, imageDoc, mime, false);
+ loadDataSync(awContents.getContentViewCore(), loadHelper, imageDoc, mime, false);
result = callDocumentHasImagesSync(awContents);
assertEquals(1, result);
}
@@ -108,6 +109,7 @@ 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;
@@ -123,31 +125,31 @@ public class AwContentsTest extends AndroidWebViewTestBase {
// First load to populate cache.
clearCacheOnUiThread(awContents, true);
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
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(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"about:blank");
// No clearCache call, so should be loaded from cache.
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
pageUrl);
assertEquals(1, webServer.getRequestCount(pagePath));
// Same as above.
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"about:blank");
// Clear cache, so should hit server again.
clearCacheOnUiThread(awContents, true);
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
pageUrl);
assertEquals(2, webServer.getRequestCount(pagePath));
@@ -185,6 +187,7 @@ 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 {
@@ -200,8 +203,8 @@ public class AwContentsTest extends AndroidWebViewTestBase {
// the page load completes which makes it slightly hard to test.
final Bitmap defaultFavicon = awContents.getFavicon();
- getContentSettingsOnUiThread(awContents).setImagesEnabled(true);
- loadUrlSync(awContents, mContentsClient.getOnPageFinishedHelper(), pageUrl);
+ getContentSettingsOnUiThread(contentViewCore).setImagesEnabled(true);
+ loadUrlSync(contentViewCore, 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 62a395c0..436f34a 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
@@ -51,16 +51,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
* In this case, requiresJsEnabled constructor argument must be set to true.
*/
abstract class AwSettingsTestHelper<T> {
- protected final AwContents mAwContents;
+ protected final ContentViewCore mContentViewCore;
protected final TestAwContentsClient mContentViewClient;
protected final ContentSettings mContentSettings;
- AwSettingsTestHelper(AwContents awContents,
+ AwSettingsTestHelper(ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
boolean requiresJsEnabled) throws Throwable {
- mAwContents = awContents;
+ mContentViewCore = contentViewCore;
mContentViewClient = contentViewClient;
- mContentSettings = getContentSettingsOnUiThread(mAwContents);
+ mContentSettings = getContentSettingsOnUiThread(mContentViewCore);
if (requiresJsEnabled) {
mContentSettings.setJavaScriptEnabled(true);
}
@@ -93,12 +93,12 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected abstract void doEnsureSettingHasValue(T value) throws Throwable;
protected String getTitleOnUiThread() throws Throwable {
- return AwSettingsTest.this.getTitleOnUiThread(mAwContents);
+ return AwSettingsTest.this.getTitleOnUiThread(mContentViewCore);
}
protected void loadDataSync(String data) throws Throwable {
AwSettingsTest.this.loadDataSync(
- mAwContents,
+ mContentViewCore,
mContentViewClient.getOnPageFinishedHelper(),
data,
"text/html",
@@ -107,7 +107,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected void loadUrlSync(String url) throws Throwable {
AwSettingsTest.this.loadUrlSync(
- mAwContents,
+ mContentViewCore,
mContentViewClient.getOnPageFinishedHelper(),
url);
}
@@ -122,9 +122,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(AwContents awContents,
+ AwSettingsJavaScriptTestHelper(ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, false);
+ super(contentViewCore, contentViewClient, false);
}
@Override
@@ -166,9 +166,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// JavaScript state.
class AwSettingsJavaScriptDynamicTestHelper extends AwSettingsJavaScriptTestHelper {
AwSettingsJavaScriptDynamicTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient);
+ super(contentViewCore, contentViewClient);
// Load the page.
super.doEnsureSettingHasValue(getInitialValue());
}
@@ -178,7 +178,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
String oldTitle = getTitleOnUiThread();
String newTitle = oldTitle + "_modified";
executeJavaScriptAndWaitForResult(
- mAwContents, mContentViewClient, getScript(newTitle));
+ mContentViewCore, mContentViewClient, getScript(newTitle));
assertEquals(value == ENABLED ? newTitle : oldTitle, getTitleOnUiThread());
}
@@ -191,9 +191,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String PLUGINS_ENABLED_STRING = "Embed";
private static final String PLUGINS_DISABLED_STRING = "NoEmbed";
- AwSettingsPluginsTestHelper(AwContents awContents,
+ AwSettingsPluginsTestHelper(ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -232,9 +232,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsStandardFontFamilyTestHelper extends AwSettingsTestHelper<String> {
AwSettingsStandardFontFamilyTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -272,9 +272,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsDefaultFontSizeTestHelper extends AwSettingsTestHelper<Integer> {
AwSettingsDefaultFontSizeTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -314,10 +314,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private ImagePageGenerator mGenerator;
AwSettingsLoadImagesAutomaticallyTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
ImagePageGenerator generator) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mGenerator = generator;
}
@@ -353,9 +353,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<String> {
AwSettingsDefaultTextEncodingTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -395,9 +395,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String CUSTOM_UA = "ChromeViewTest";
AwSettingsUserAgentStringTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mDefaultUa = mContentSettings.getUserAgentString();
}
@@ -445,9 +445,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String HAS_LOCAL_STORAGE = "Has localStorage";
AwSettingsDomStorageEnabledTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -487,9 +487,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsUniversalAccessFromFilesTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, 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.
@@ -538,9 +538,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsFileAccessFromFilesIframeTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
@@ -585,9 +585,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "Exception";
AwSettingsFileAccessFromFilesXhrTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mXhrContainerUrl = UrlUtils.getTestFileUrl("webview/xhr_access.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
// The value of the setting depends on the SDK version.
@@ -630,10 +630,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "about:blank";
AwSettingsFileUrlAccessTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
int startIndex) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mIndex = startIndex;
}
@@ -675,10 +675,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private final String mTarget;
AwSettingsContentUrlAccessTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
int index) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mTarget = "content_access_" + index;
}
@@ -706,7 +706,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
AwSettingsTest.this.resetResourceRequestCountInContentProvider(mTarget);
AwSettingsTest.this.loadUrlSync(
- mAwContents,
+ mContentViewCore,
mContentViewClient.getOnPageFinishedHelper(),
AwSettingsTest.this.createContentUrl(mTarget));
if (value == ENABLED) {
@@ -733,16 +733,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
+ "</head><body onload=\"document.title='" + JS_ENABLED_STRING
+ "';\"></body></html>";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
loadDataSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
TEST_PAGE_HTML,
"text/html",
false);
- assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(awContents));
+ assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -750,8 +749,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -759,8 +758,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -768,8 +767,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -777,8 +776,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -786,8 +785,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -795,8 +794,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -804,8 +803,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -813,8 +812,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -822,8 +821,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -831,8 +830,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -840,8 +839,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -849,8 +848,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -858,8 +857,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -867,8 +866,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -876,8 +875,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
}
// The test verifies that disabling images loading by setting
@@ -888,67 +887,63 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@SmallTest
public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
- ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
+ ContentSettings settings0 = getContentSettingsOnUiThread(views.getView0());
settings0.setJavaScriptEnabled(true);
- ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
+ ContentSettings settings1 = getContentSettingsOnUiThread(views.getView1());
settings1.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
// First disable images loading and verify it.
settings0.setLoadsImagesAutomatically(false);
settings1.setLoadsImagesAutomatically(false);
- loadDataSync(views.getContents0(),
+ loadDataSync(views.getView0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
views.getClient1().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getContents0()));
+ getTitleOnUiThread(views.getView0()));
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
+ getTitleOnUiThread(views.getView1()));
// Now enable images loading only for view 0.
settings0.setLoadsImagesAutomatically(true);
- loadDataSync(views.getContents0(),
+ loadDataSync(views.getView0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
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.getContents0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
ImagePageGenerator generator1 = new ImagePageGenerator(1, false);
// This is a new image. view 1 can't load it.
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
views.getClient1().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
- loadDataSync(views.getContents0(),
+ getTitleOnUiThread(views.getView1()));
+ loadDataSync(views.getView0(),
views.getClient0().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
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.getContents0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
}
// The test verifies that after changing the LoadsImagesAutomatically
@@ -958,27 +953,26 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setLoadsImagesAutomatically(false);
- loadDataSync(awContents,
+ loadDataSync(contentView,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
settings.setLoadsImagesAutomatically(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
try {
return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUiThread: " + t.toString());
@@ -986,7 +980,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
}
}
}, TEST_TIMEOUT, CHECK_INTERVAL));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -995,9 +989,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1006,9 +1000,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1017,9 +1011,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1027,8 +1021,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1036,8 +1030,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1045,8 +1039,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
}
// The test verifies that the default user agent string follows the format
@@ -1059,10 +1053,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringDefault() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
final String actualUserAgentString = settings.getUserAgentString();
final String patternString =
"Mozilla/5\\.0 \\(Linux;( U;)? Android ([^;]+);( (\\w+)-(\\w+);)?" +
@@ -1088,10 +1081,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverride() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
final String defaultUserAgentString = settings.getUserAgentString();
// Check that an attempt to reset the default UA string has no effect.
@@ -1118,12 +1110,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverrideForHistory() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentViewCore contentView = testContainerView.getContentViewCore();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
final String defaultUserAgentString = settings.getUserAgentString();
final String customUserAgentString = "ContentSettingsTest";
@@ -1139,19 +1129,19 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String page2 = String.format(pageTemplate, page2Title);
settings.setUserAgentString(customUserAgentString);
loadDataSync(
- awContents, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
- assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(awContents));
+ contentView, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
+ assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(contentView));
loadDataSync(
- awContents, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
+ contentView, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
settings.setUserAgentString(null);
// Must not cause any changes until the next page loading.
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
HistoryUtils.goBackSync(getInstrumentation(), contentView, onPageFinishedHelper);
- assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(awContents));
+ assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(contentView));
HistoryUtils.goForwardSync(getInstrumentation(), contentView,
onPageFinishedHelper);
- assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(awContents));
+ assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -1159,8 +1149,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1168,8 +1158,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1177,8 +1167,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1186,8 +1176,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1195,8 +1185,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1204,8 +1194,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1213,10 +1203,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1224,10 +1212,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1235,10 +1221,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
}
// This test verifies that local image resources can be loaded from file:
@@ -1249,15 +1233,14 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
final String imageHeight = "16";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
settings.setAllowUniversalAccessFromFileURLs(false);
settings.setAllowFileAccessFromFileURLs(false);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
- assertEquals(imageHeight, getTitleOnUiThread(awContents));
+ loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
+ assertEquals(imageHeight, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -1266,9 +1249,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents0(), views.getClient0()),
+ views.getView0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents1(), views.getClient1()));
+ views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1277,9 +1260,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents0(), views.getClient0()),
+ views.getView0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents1(), views.getClient1()));
+ views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1288,9 +1271,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents0(), views.getClient0()),
+ views.getView0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents1(), views.getClient1()));
+ views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1298,10 +1281,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1309,10 +1290,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1320,10 +1299,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
}
/**
@@ -1335,8 +1312,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1348,8 +1325,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1361,8 +1338,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1374,8 +1351,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1387,8 +1364,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1400,17 +1377,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
@SmallTest
@Feature({"Android-WebView", "Preferences", "Navigation"})
public void testBlockingContentUrlsFromDataUrls() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
final String target = "content_from_data";
final String page = "<html><body>" +
"<img src=\"" +
@@ -1418,7 +1394,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
"</body></html>";
resetResourceRequestCountInContentProvider(target);
loadDataSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
page,
"text/html",
@@ -1428,9 +1404,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private void doTestContentUrlFromFile(boolean addQueryParameters) throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
final String target = "content_from_file_" + addQueryParameters;
Context context = getInstrumentation().getTargetContext();
final String fileName = context.getCacheDir() + "/" + target + ".html";
@@ -1443,7 +1418,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
(addQueryParameters ? "?weather=sunny&life=good" : "") +
"\">");
loadUrlSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
ensureResourceRequestCountInContentProvider(target, 1);
@@ -1477,30 +1452,28 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setJavaScriptEnabled(true);
settings.setImagesEnabled(false);
- loadDataSync(awContents,
+ loadDataSync(contentView,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html",
false);
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
}
@SmallTest
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1516,9 +1489,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String httpImageUrl = webServer.setResponse(pagePath, httpUrlImageHtml, null);
settings.setImagesEnabled(false);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), httpImageUrl);
+ loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), httpImageUrl);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
settings.setImagesEnabled(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@@ -1526,7 +1499,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public boolean isSatisfied() {
try {
return ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUIThread: " + t.toString());
@@ -1547,15 +1520,14 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
try {
useTestResourceContext();
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
@@ -1569,15 +1541,14 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
try {
useTestResourceContext();
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
@@ -1591,17 +1562,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
@@ -1615,46 +1585,45 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
}
class ViewPair {
- private final AwContents contents0;
+ private final ContentViewCore view0;
private final TestAwContentsClient client0;
- private final AwContents contents1;
+ private final ContentViewCore view1;
private final TestAwContentsClient client1;
- ViewPair(AwContents contents0, TestAwContentsClient client0,
- AwContents contents1, TestAwContentsClient client1) {
- this.contents0 = contents0;
+ ViewPair(ContentViewCore view0, TestAwContentsClient client0,
+ ContentViewCore view1, TestAwContentsClient client1) {
+ this.view0 = view0;
this.client0 = client0;
- this.contents1 = contents1;
+ this.view1 = view1;
this.client1 = client1;
}
- AwContents getContents0() {
- return contents0;
+ ContentViewCore getView0() {
+ return view0;
}
TestAwContentsClient getClient0() {
return client0;
}
- AwContents getContents1() {
- return contents1;
+ ContentViewCore getView1() {
+ return view1;
}
TestAwContentsClient getClient1() {
@@ -1715,10 +1684,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
TestAwContentsClient client1 = new TestAwContentsClient();
return new ViewPair(
createAwTestContainerViewOnMainSync(
- firstIsIncognito, client0).getAwContents(),
+ firstIsIncognito, client0).getContentViewCore(),
client0,
createAwTestContainerViewOnMainSync(
- secondIsIncognito, client1).getAwContents(),
+ secondIsIncognito, client1).getContentViewCore(),
client1);
}
@@ -1763,8 +1732,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final TestAwContentsClient contentClient = new TestAwContentsClient();
final AwTestContainerView testContainer =
createAwTestContainerViewOnMainSync(false, contentClient);
- final AwContents awContents = testContainer.getAwContents();
- final ContentSettings contentSettings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView = testContainer.getContentViewCore();
+ final ContentSettings contentSettings = getContentSettingsOnUiThread(contentView);
final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
contentSettings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1791,20 +1760,20 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// Actual test. Blocking should trigger onerror handler.
awSettings.setBlockNetworkLoads(true);
loadUrlSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(0, webServer.getRequestCount(httpPath));
- assertEquals("img_onerror_fired", getTitleOnUiThread(awContents));
+ assertEquals("img_onerror_fired", getTitleOnUiThread(contentView));
// Unblock should load normally.
awSettings.setBlockNetworkLoads(false);
loadUrlSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(1, webServer.getRequestCount(httpPath));
- assertEquals("img_onload_fired", getTitleOnUiThread(awContents));
+ assertEquals("img_onload_fired", getTitleOnUiThread(contentView));
} finally {
if (fileName != null) TestFileUtil.deleteFile(fileName);
if (webServer != null) webServer.shutdown();
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 569a7b8..3ba0bf4 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,7 +6,6 @@ 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;
@@ -28,14 +27,12 @@ public class ClearHistoryTest extends AndroidWebViewTestBase {
@Feature({"History", "Main"})
public void testClearHistory() throws Throwable {
final TestAwContentsClient contentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentsClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentViewCore contentViewCore = testContainerView.getContentViewCore();
+ final ContentViewCore contentViewCore =
+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
OnPageFinishedHelper onPageFinishedHelper = contentsClient.getOnPageFinishedHelper();
for (int i = 0; i < 3; i++) {
- loadUrlSync(awContents, onPageFinishedHelper, URLS[i]);
+ loadUrlSync(contentViewCore, 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 4c61559..f374b79 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,20 +24,19 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
private static final String TEST_MESSAGE_TWO = "The second test message.";
private TestAwContentsClient mContentsClient;
- private AwContents mAwContents;
+ private ContentViewCore mContentViewCore;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- mAwContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
+ mContentViewCore.getContentSettings().setJavaScriptEnabled(true);
}
});
}
@@ -64,7 +63,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
mContentsClient.getAddMessageToConsoleHelper();
int callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("error", "msg"),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -72,7 +71,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
addMessageToConsoleHelper.getLevel());
callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("warn", "msg"),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -80,7 +79,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
addMessageToConsoleHelper.getLevel());
callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("log", "msg"),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -98,7 +97,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
mContentsClient.getAddMessageToConsoleHelper();
int callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE),
"text/html", false);
Log.w("test", getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE));
@@ -106,7 +105,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
assertEquals(TEST_MESSAGE_ONE, addMessageToConsoleHelper.getMessage());
callCount = addMessageToConsoleHelper.getCallCount();
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getLogMessageJavaScriptData("log", TEST_MESSAGE_TWO),
"text/html", false);
addMessageToConsoleHelper.waitForCallback(callCount);
@@ -121,7 +120,7 @@ public class ClientAddMessageToConsoleTest extends AndroidWebViewTestBase {
int callCount = addMessageToConsoleHelper.getCallCount();
String data = getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE);
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, 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 ff9e660..9d9cc16 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,15 +18,14 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private AwContents mAwContents;
+ private ContentViewCore mContentViewCore;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
@MediumTest
@@ -37,7 +36,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
String html = "<html><body>Simple page.</body></html>";
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(mAwContents, html, "text/html", false);
+ loadDataAsync(mContentViewCore, html, "text/html", false);
onPageFinishedHelper.waitForCallback(currentCallCount);
assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl());
@@ -58,7 +57,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(mAwContents, url);
+ loadUrlAsync(mContentViewCore, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
@@ -84,7 +83,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
assertEquals(0, onPageFinishedHelper.getCallCount());
final int pageWithSubresourcesCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(mAwContents,
+ loadDataAsync(mContentViewCore,
"<html><iframe src=\"" + testPath + "\" /></html>",
"text/html",
false);
@@ -96,7 +95,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(mAwContents, syncUrl);
+ loadUrlAsync(mContentViewCore, 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 4a99f6a..a4a2be2 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,7 +7,6 @@ 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;
@@ -21,15 +20,14 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private AwContents mAwContents;
+ private ContentViewCore mContentViewCore;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
/*@MediumTest
@@ -43,7 +41,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
String url = "http://man.id.be.really.surprised.if.this.address.existed.blah/";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
- loadUrlAsync(mAwContents, url);
+ loadUrlAsync(mContentViewCore, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_HOST_LOOKUP,
@@ -64,7 +62,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
String url = "foo://some/resource";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
- loadUrlAsync(mAwContents, url);
+ loadUrlAsync(mContentViewCore, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_UNSUPPORTED_SCHEME,
@@ -82,7 +80,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
mContentsClient.getOnPageFinishedHelper();
int currentCallCount = onPageFinishedHelper.getCallCount();
- loadDataAsync(mAwContents,
+ loadDataAsync(mContentViewCore,
"<html><iframe src=\"http//invalid.url.co/\" /></html>",
"text/html",
false);
@@ -100,7 +98,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
final String url = "file:///android_asset/does_not_exist.html";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
useTestResourceContext();
- loadUrlAsync(mAwContents, url);
+ loadUrlAsync(mContentViewCore, url);
onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
assertEquals(ErrorCodeConversionHelper.ERROR_UNKNOWN,
@@ -121,7 +119,7 @@ public class ClientOnReceivedErrorTest extends AndroidWebViewTestBase {
final String url = "file:///android_res/raw/does_not_exist.html";
int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
useTestResourceContext();
- loadUrlAsync(mAwContents, url);
+ loadUrlAsync(mContentViewCore, 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 0fc0282..ffac55a 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,7 +14,6 @@ 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;
@@ -32,17 +31,14 @@ 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();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
- mContentViewCore = testContainerView.getContentViewCore();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
/**
@@ -57,7 +53,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
.append("</body></html>");
// Test flinging in the y axis
- loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(),
+ loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
testPage.toString());
assertEquals(0, mContentViewCore.getNativeScrollYForTest());
ThreadUtils.runOnUiThread(new Runnable() {
@@ -155,7 +151,7 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase {
*/
@DisabledTest
public void testSetGetBackgroundColor() throws Throwable {
- loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), "about:blank");
+ loadUrlSync(mContentViewCore, 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 9409ff7..b1c6451 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,7 +11,6 @@ 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;
@@ -30,17 +29,14 @@ 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();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
- mContentViewCore = testContainerView.getContentViewCore();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
private String getZoomableHtml() {
@@ -193,11 +189,11 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
}
private void runMagnificationTest(boolean supportZoom) throws Throwable {
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getZoomableHtml(), "text/html", false);
// It takes some time for scaling to settle down.
waitUntilCanNotZoomOut();
- getContentSettingsOnUiThread(mAwContents).setSupportZoom(supportZoom);
+ getContentSettingsOnUiThread(mContentViewCore).setSupportZoom(supportZoom);
assertTrue("Should be able to zoom in", canZoomInOnUiThread());
assertFalse("Should not be able to zoom out", canZoomOutOnUiThread());
@@ -237,18 +233,18 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testZoomUsingMultiTouch() throws Throwable {
- ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore);
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getZoomableHtml(), "text/html", false);
assertTrue(webSettings.supportZoom());
assertFalse(webSettings.getBuiltInZoomControls());
assertFalse(isMultiTouchZoomSupportedOnUiThread());
- getContentSettingsOnUiThread(mAwContents).setBuiltInZoomControls(true);
+ getContentSettingsOnUiThread(mContentViewCore).setBuiltInZoomControls(true);
assertTrue(isMultiTouchZoomSupportedOnUiThread());
- getContentSettingsOnUiThread(mAwContents).setSupportZoom(false);
+ getContentSettingsOnUiThread(mContentViewCore).setSupportZoom(false);
assertFalse(isMultiTouchZoomSupportedOnUiThread());
}
@@ -259,8 +255,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
*/
@FlakyTest
public void testZoomControls() throws Throwable {
- ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore);
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getZoomableHtml(), "text/html", false);
assertTrue(webSettings.supportZoom());
@@ -283,8 +279,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testZoomControlsOnNonZoomableContent() throws Throwable {
- ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore);
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
getNonZoomableHtml(), "text/html", false);
// ContentView must update itself according to the viewport setup.
@@ -306,8 +302,8 @@ public class ContentViewZoomTest extends AndroidWebViewTestBase {
*/
@DisabledTest
public void testZoomControlsOnOrientationChange() throws Throwable {
- ContentSettings webSettings = getContentSettingsOnUiThread(mAwContents);
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ ContentSettings webSettings = getContentSettingsOnUiThread(mContentViewCore);
+ loadDataSync(mContentViewCore, 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 24f8ded..6309296 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,19 +31,18 @@ import java.util.concurrent.atomic.AtomicInteger;
public class CookieManagerTest extends AndroidWebViewTestBase {
private CookieManager mCookieManager;
- private TestAwContentsClient mContentsClient;
- private AwContents mAwContents;
+ private TestAwContentsClient mContentViewClient;
+ private ContentViewCore mContentViewCore;
@Override
protected void setUp() throws Exception {
super.setUp();
mCookieManager = new CookieManager();
- mContentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
- mAwContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
+ mContentViewClient = new TestAwContentsClient();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentViewClient).getContentViewCore();
+ mContentViewCore.getContentSettings().setJavaScriptEnabled(true);
assertNotNull(mCookieManager);
}
@@ -73,7 +72,7 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
assertFalse(mCookieManager.acceptCookie());
assertFalse(mCookieManager.hasCookies());
- loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
setCookie("test1", "value1");
assertNull(mCookieManager.getCookie(url));
@@ -81,14 +80,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(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
assertNull(mCookieManager.getCookie(url));
mCookieManager.setAcceptCookie(true);
assertTrue(mCookieManager.acceptCookie());
url = webServer.setResponse(path, responseStr, null);
- loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
setCookie("test2", "value2");
waitForCookie(url);
String cookie = mCookieManager.getCookie(url);
@@ -99,7 +98,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(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+ loadUrlSync(mContentViewCore, mContentViewClient.getOnPageFinishedHelper(), url);
waitForCookie(url);
cookie = mCookieManager.getCookie(url);
assertNotNull(cookie);
@@ -115,13 +114,13 @@ public class CookieManagerTest extends AndroidWebViewTestBase {
private void setCookie(final String name, final String value)
throws Throwable {
OnEvaluateJavaScriptResultHelper onEvaluateJavaScriptResultHelper =
- mContentsClient.getOnEvaluateJavaScriptResultHelper();
+ mContentViewClient.getOnEvaluateJavaScriptResultHelper();
int currentCallCount = onEvaluateJavaScriptResultHelper.getCallCount();
final AtomicInteger requestId = new AtomicInteger();
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- requestId.set(mAwContents.getContentViewCore().evaluateJavaScript(
+ requestId.set(mContentViewCore.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 366cfcc..c157249 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 AwContents mAwContents;
+ private ContentViewCore mContentViewCore;
private static class PageInfo {
public final String mTitle;
@@ -39,9 +39,8 @@ public class GetTitleTest extends AndroidWebViewTestBase {
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
private static final String getHtml(String title) {
@@ -55,9 +54,9 @@ public class GetTitleTest extends AndroidWebViewTestBase {
}
private String loadFromDataAndGetTitle(String html) throws Throwable {
- loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
html, "text/html", false);
- return getTitleOnUiThread(mAwContents);
+ return getTitleOnUiThread(mContentViewCore);
}
private PageInfo loadFromUrlAndGetTitle(String html, String filename) throws Throwable {
@@ -66,8 +65,8 @@ public class GetTitleTest extends AndroidWebViewTestBase {
webServer = new TestWebServer(false);
final String url = webServer.setResponse(filename, html, null);
- loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
- return new PageInfo(getTitleOnUiThread(mAwContents),
+ loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), url);
+ return new PageInfo(getTitleOnUiThread(mContentViewCore),
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 7f6e72d..609b62e 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,7 +6,6 @@ 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;
@@ -24,17 +23,14 @@ 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();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
- mContentViewCore = testContainerView.getContentViewCore();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
protected void loadDataWithBaseUrlSync(
@@ -54,7 +50,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- mAwContents.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl(
+ mContentViewCore.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl(
data, mimeType, isBase64Encoded, baseUrl, historyUrl));
}
});
@@ -96,7 +92,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
webServer.setResponseBase64("/" + CommonResources.FAVICON_FILENAME,
CommonResources.FAVICON_DATA_BASE64, CommonResources.getImagePngHeaders(true));
- ContentSettings contentSettings = getContentSettingsOnUiThread(mAwContents);
+ ContentSettings contentSettings = getContentSettingsOnUiThread(mContentViewCore);
contentSettings.setImagesEnabled(true);
contentSettings.setJavaScriptEnabled(true);
@@ -104,7 +100,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
CommonResources.getOnImageLoadedHtml(CommonResources.FAVICON_FILENAME),
"text/html", false, webServer.getBaseUrl(), null);
- assertEquals("5", getTitleOnUiThread(mAwContents));
+ assertEquals("5", getTitleOnUiThread(mContentViewCore));
} finally {
if (webServer != null) webServer.shutdown();
}
@@ -121,9 +117,9 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
CommonResources.getTextJavascriptHeaders(true));
final String pageHtml = getScriptFileTestPageHtml(scriptUrl);
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
loadDataWithBaseUrlSync(pageHtml, "text/html", false, webServer.getBaseUrl(), null);
- assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mAwContents));
+ assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mContentViewCore));
} finally {
if (webServer != null) webServer.shutdown();
@@ -140,9 +136,9 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
CommonResources.ABOUT_HTML, CommonResources.getTextHtmlHeaders(true));
final String html = getCrossOriginAccessTestPageHtml(frameUrl);
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
loadDataWithBaseUrlSync(html, "text/html", false, webServer.getBaseUrl(), null);
- assertEquals(frameUrl, getTitleOnUiThread(mAwContents));
+ assertEquals(frameUrl, getTitleOnUiThread(mContentViewCore));
} finally {
if (webServer != null) webServer.shutdown();
@@ -160,12 +156,12 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
final String html = getCrossOriginAccessTestPageHtml(frameUrl);
final String baseUrl = webServer.getBaseUrl().replaceFirst("localhost", "127.0.0.1");
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).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(mAwContents));
+ assertEquals("undefined", getTitleOnUiThread(mContentViewCore));
} finally {
if (webServer != null) webServer.shutdown();
@@ -175,11 +171,11 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testNullBaseUrl() throws Throwable {
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).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(mAwContents));
+ assertEquals("about:blank", getTitleOnUiThread(mContentViewCore));
}
@SmallTest
@@ -213,23 +209,23 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testAccessToLocalFile() throws Throwable {
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).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(mAwContents));
+ assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mContentViewCore));
}
@SmallTest
@Feature({"Android-WebView"})
public void testFailedAccessToLocalFile() throws Throwable {
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).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(mAwContents));
+ assertEquals(SCRIPT_NOT_LOADED, getTitleOnUiThread(mContentViewCore));
}
@SmallTest
@@ -246,7 +242,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
"<body>" + page1Title + "</body></html>";
loadDataWithBaseUrlSync(page1Html, "text/html", false, null, historyUrl);
- assertEquals(page1Title, getTitleOnUiThread(mAwContents));
+ assertEquals(page1Title, getTitleOnUiThread(mContentViewCore));
final String page2Title = "Page2";
final String page2Html = "<html><head><title>" + page2Title + "</title>" +
@@ -254,12 +250,12 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
mContentsClient.getOnPageFinishedHelper();
- loadDataSync(mAwContents, onPageFinishedHelper, page2Html, "text/html", false);
- assertEquals(page2Title, getTitleOnUiThread(mAwContents));
+ loadDataSync(mContentViewCore, onPageFinishedHelper, page2Html, "text/html", false);
+ assertEquals(page2Title, getTitleOnUiThread(mContentViewCore));
HistoryUtils.goBackSync(getInstrumentation(), mContentViewCore, onPageFinishedHelper);
// The title of the 'about.html' specified via historyUrl.
- assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mAwContents));
+ assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mContentViewCore));
} 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 30ecd95..35d6478 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,23 +22,22 @@ import java.util.concurrent.Callable;
public class NavigationHistoryTest extends AndroidWebViewTestBase {
private TestAwContentsClient mContentsClient;
- private AwContents mAwContents;
+ private ContentViewCore mContentViewCore;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(mContentsClient);
- mAwContents = testContainerView.getAwContents();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
- private NavigationHistory getNavigationHistory(final AwContents awContents)
+ private NavigationHistory getNavigationHistory(final ContentViewCore contentViewCore)
throws Exception {
return ThreadUtils.runOnUiThreadBlocking(new Callable<NavigationHistory>() {
@Override
public NavigationHistory call() {
- return awContents.getContentViewCore().getNavigationHistory();
+ return contentViewCore.getNavigationHistory();
}
});
}
@@ -61,12 +60,12 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
*/
@FlakyTest
public void testNavigateOneUrl() throws Throwable {
- NavigationHistory history = getNavigationHistory(mAwContents);
+ NavigationHistory history = getNavigationHistory(mContentViewCore);
assertEquals(0, history.getEntryCount());
- loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+ loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
"chrome://newtab/");
- history = getNavigationHistory(mAwContents);
+ history = getNavigationHistory(mContentViewCore);
checkHistoryItem(history.getEntryAtIndex(0),
"chrome://newtab/#bookmarks",
"chrome://newtab/",
@@ -78,15 +77,15 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
@SmallTest
public void testNavigateTwoUrls() throws Throwable {
- NavigationHistory list = getNavigationHistory(mAwContents);
+ NavigationHistory list = getNavigationHistory(mContentViewCore);
assertEquals(0, list.getEntryCount());
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
mContentsClient.getOnPageFinishedHelper();
- loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://newtab/");
- loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://version");
+ loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://newtab/");
+ loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://version");
- list = getNavigationHistory(mAwContents);
+ list = getNavigationHistory(mContentViewCore);
// Make sure there is a new entry entry the list
assertEquals(2, list.getEntryCount());
@@ -113,14 +112,13 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
public void testNavigateTwoUrlsAndBack() throws Throwable {
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
mContentsClient.getOnPageFinishedHelper();
- NavigationHistory list = getNavigationHistory(mAwContents);
+ NavigationHistory list = getNavigationHistory(mContentViewCore);
assertEquals(0, list.getEntryCount());
- loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://newtab/");
- loadUrlSync(mAwContents, onPageFinishedHelper, "chrome://version");
- HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getContentViewCore(),
- onPageFinishedHelper);
- list = getNavigationHistory(mAwContents);
+ loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://newtab/");
+ loadUrlSync(mContentViewCore, onPageFinishedHelper, "chrome://version");
+ HistoryUtils.goBackSync(getInstrumentation(), mContentViewCore, onPageFinishedHelper);
+ list = getNavigationHistory(mContentViewCore);
// Make sure the first entry is still okay
checkHistoryItem(list.getEntryAtIndex(0),
@@ -148,7 +146,7 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
*/
@DisabledTest
public void testFavicon() throws Throwable {
- NavigationHistory list = getNavigationHistory(mAwContents);
+ NavigationHistory list = getNavigationHistory(mContentViewCore);
String url;
TestWebServer webServer = null;
@@ -160,14 +158,14 @@ public class NavigationHistoryTest extends AndroidWebViewTestBase {
url = webServer.setResponse("/favicon.html", CommonResources.FAVICON_STATIC_HTML, null);
assertEquals(0, list.getEntryCount());
- getContentSettingsOnUiThread(mAwContents).setImagesEnabled(true);
- loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
+ getContentSettingsOnUiThread(mContentViewCore).setImagesEnabled(true);
+ loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), url);
} finally {
if (webServer != null) webServer.shutdown();
}
- list = getNavigationHistory(mAwContents);
+ list = getNavigationHistory(mContentViewCore);
// 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 786b9ed..e2e289d 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,19 +9,20 @@ 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 AwContents mAwContents;
+ private ContentViewCore mContentViewCore;
@Override
public void setUp() throws Exception {
super.setUp();
mContentsClient = new TestAwContentsClient();
- mAwContents = createAwTestContainerViewOnMainSync(mContentsClient).getAwContents();
+ mContentViewCore =
+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
}
/**
@@ -31,16 +32,16 @@ public class UserAgentTest extends AndroidWebViewTestBase {
@SmallTest
@Feature({"Android-WebView"})
public void testNoExtraSpaceBeforeBuildName() throws Throwable {
- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);
+ getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);
loadDataSync(
- mAwContents,
+ mContentViewCore,
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(mAwContents);
+ final String ua = getTitleOnUiThread(mContentViewCore);
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 dc235179..bdefbfb 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, contentsClient.getOnPageFinishedHelper(),
+ loadDataSync(contents.getContentViewCore(), 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 e679214..4597da4 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 AwContents awContents = view.getAwContents();
+ final ContentViewCore contentViewCore = view.getContentViewCore();
- enableJavaScriptOnUiThread(awContents);
- loadDataSync(awContents, client.getOnPageFinishedHelper(),
+ enableJavaScriptOnUiThread(contentViewCore);
+ loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- executeJavaScriptAndWaitForResult(awContents, client,
+ executeJavaScriptAndWaitForResult(contentViewCore, client,
"alert('" + ALERT_TEXT + "')");
assertTrue(callbackCalled.get());
}
@@ -81,12 +81,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- final AwContents awContents = view.getAwContents();
+ ContentViewCore contentViewCore = view.getContentViewCore();
- enableJavaScriptOnUiThread(awContents);
- loadDataSync(awContents, client.getOnPageFinishedHelper(),
+ enableJavaScriptOnUiThread(contentViewCore);
+ loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- String result = executeJavaScriptAndWaitForResult(awContents, client,
+ String result = executeJavaScriptAndWaitForResult(contentViewCore, 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);
- final AwContents awContents = view.getAwContents();
- enableJavaScriptOnUiThread(awContents);
+ ContentViewCore contentViewCore = view.getContentViewCore();
+ enableJavaScriptOnUiThread(contentViewCore);
- loadDataSync(awContents, client.getOnPageFinishedHelper(),
+ loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- String result = executeJavaScriptAndWaitForResult(awContents, client,
+ String result = executeJavaScriptAndWaitForResult(contentViewCore, client,
"confirm('" + CONFIRM_TEXT + "')");
assertTrue(called.get());
assertEquals("true", result);
@@ -141,12 +141,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- final AwContents awContents = view.getAwContents();
- enableJavaScriptOnUiThread(awContents);
+ ContentViewCore contentViewCore = view.getContentViewCore();
+ enableJavaScriptOnUiThread(contentViewCore);
- loadDataSync(awContents, client.getOnPageFinishedHelper(),
+ loadDataSync(contentViewCore, client.getOnPageFinishedHelper(),
EMPTY_PAGE, "text/html", false);
- String result = executeJavaScriptAndWaitForResult(awContents, client,
+ String result = executeJavaScriptAndWaitForResult(contentViewCore, client,
"confirm('" + CONFIRM_TEXT + "')");
assertTrue(called.get());
assertEquals("false", result);
@@ -167,16 +167,16 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
}
};
AwTestContainerView view = createAwTestContainerViewOnMainSync(client);
- final AwContents awContents = view.getAwContents();
- enableJavaScriptOnUiThread(awContents);
+ ContentViewCore contentViewCore = view.getContentViewCore();
+ enableJavaScriptOnUiThread(contentViewCore);
- loadDataSync(awContents, client.getOnPageFinishedHelper(), BEFORE_UNLOAD_URL,
+ loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), BEFORE_UNLOAD_URL,
"text/html", false);
- enableJavaScriptOnUiThread(awContents);
+ enableJavaScriptOnUiThread(contentViewCore);
// Don't wait synchronously because we don't leave the page.
int currentCallCount = jsBeforeUnloadHelper.getCallCount();
- loadDataAsync(awContents, EMPTY_PAGE, "text/html", false);
+ loadDataAsync(contentViewCore, EMPTY_PAGE, "text/html", false);
jsBeforeUnloadHelper.waitForCallback(currentCallCount);
}
}
generated by cgit v1.1 at 2025-02-19 00:17:16 +0000