| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
|
| 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 57a126a779cc8623590f237223386c74eafa17d0..4943bf8d9c7dc0997fb7bb39571d4da77552dcc5 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
|
| @@ -832,10 +832,15 @@ public class AwSettingsTest extends AwTestBase {
|
| @Override
|
| protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
|
| AwSettingsTest.this.resetResourceRequestCountInContentProvider(mTarget);
|
| - loadUrlSync(AwSettingsTest.this.createContentUrl(mTarget));
|
| if (value == ENABLED) {
|
| + loadUrlSync(AwSettingsTest.this.createContentUrl(mTarget));
|
| + String title = getTitleOnUiThread();
|
| + assertTrue(title != null);
|
| + assertTrue("[" + mTarget + "] Actual title: \"" + title + "\"",
|
| + title.contains(mTarget));
|
| AwSettingsTest.this.ensureResourceRequestCountInContentProvider(mTarget, 1);
|
| } else {
|
| + loadUrlSyncAndExpectError(AwSettingsTest.this.createContentUrl(mTarget));
|
| AwSettingsTest.this.ensureResourceRequestCountInContentProvider(mTarget, 0);
|
| }
|
| }
|
| @@ -1726,12 +1731,8 @@ public class AwSettingsTest extends AwTestBase {
|
| views.getClient1()));
|
| }
|
|
|
| - /*
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Preferences"})
|
| - crbug.com/370950
|
| - */
|
| - @DisabledTest
|
| public void testFileUrlAccessWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| runPerViewSettingsTest(
|
| @@ -1739,12 +1740,8 @@ public class AwSettingsTest extends AwTestBase {
|
| new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
|
| }
|
|
|
| - /*
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Preferences"})
|
| - crbug.com/370950
|
| - */
|
| - @DisabledTest
|
| public void testContentUrlAccessWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| runPerViewSettingsTest(
|
| @@ -2185,12 +2182,8 @@ public class AwSettingsTest extends AwTestBase {
|
| }
|
| }
|
|
|
| - /*
|
| @SmallTest
|
| @Feature({"AndroidWebView", "Preferences"})
|
| - See crbug.com/374305
|
| - */
|
| - @DisabledTest
|
| public void testCacheModeWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| TestWebServer webServer = null;
|
|
|