android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java - Issue 14271024: [Android WebView] Move the most of WebSettings into AwSettings

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

Issue 14271024: [Android WebView] Move the most of WebSettings into AwSettings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updated findbugs issues Created 7 years, 8 months ago

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

Jump to:

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

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java » ('j') | android_webview/native/aw_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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 c54051ba053b3df90bbf412677c2993be3fdc298..8871ebee369ea0d3774bc659fc872f1f5c852edf 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

@@ -9,10 +9,10 @@ import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.android_webview.AndroidProtocolHandler;

import org.chromium.android_webview.AwContents;

+import org.chromium.android_webview.AwSettings;

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

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

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

-import org.chromium.content.browser.ContentSettings;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.LoadUrlParams;

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

@@ -100,7 +100,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

webServer.setResponseBase64("/" + CommonResources.FAVICON_FILENAME,

CommonResources.FAVICON_DATA_BASE64, CommonResources.getImagePngHeaders(true));

- ContentSettings contentSettings = getContentSettingsOnUiThread(mAwContents);

+ AwSettings contentSettings = getAwSettingsOnUiThread(mAwContents);

contentSettings.setImagesEnabled(true);

contentSettings.setJavaScriptEnabled(true);

@@ -125,7 +125,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

CommonResources.getTextJavascriptHeaders(true));

final String pageHtml = getScriptFileTestPageHtml(scriptUrl);

- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

+ getAwSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

loadDataWithBaseUrlSync(pageHtml, "text/html", false, webServer.getBaseUrl(), null);

assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mAwContents));

@@ -144,7 +144,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

CommonResources.ABOUT_HTML, CommonResources.getTextHtmlHeaders(true));

final String html = getCrossOriginAccessTestPageHtml(frameUrl);

- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

+ getAwSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

loadDataWithBaseUrlSync(html, "text/html", false, webServer.getBaseUrl(), null);

assertEquals(frameUrl, getTitleOnUiThread(mAwContents));

@@ -164,7 +164,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

final String html = getCrossOriginAccessTestPageHtml(frameUrl);

final String baseUrl = webServer.getBaseUrl().replaceFirst("localhost", "127.0.0.1");

- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

+ getAwSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

loadDataWithBaseUrlSync(html, "text/html", false, baseUrl, null);

// TODO(mnaganov): Catch a security exception and set the title accordingly,

@@ -179,7 +179,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

@SmallTest

@Feature({"AndroidWebView"})

public void testNullBaseUrl() throws Throwable {

- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

+ getAwSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

final String pageHtml = "<html><body onload='document.title=document.location.href'>" +

"</body></html>";

loadDataWithBaseUrlSync(pageHtml, "text/html", false, null, null);

@@ -294,7 +294,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

fos.close();

String imagePath = tempImage.getAbsolutePath();

- ContentSettings contentSettings = getContentSettingsOnUiThread(mAwContents);

+ AwSettings contentSettings = getAwSettingsOnUiThread(mAwContents);

contentSettings.setImagesEnabled(true);

contentSettings.setJavaScriptEnabled(true);