| 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 8086700aec60d9a87ae3dd7cb553369a9e53ecd3..2da1eb9daf9bbacef21f4cb15aa2c42546a2a587 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
|
| @@ -1570,12 +1570,8 @@ public class AwSettingsTest extends AwTestBase {
|
| }
|
| }
|
|
|
| - /**
|
| - * @SmallTest
|
| - * @Feature({"AndroidWebView", "Preferences"})
|
| - * crbug.com/277077
|
| - */
|
| - @DisabledTest
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| public void testDomStorageEnabledWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| runPerViewSettingsTest(
|
| @@ -1621,12 +1617,8 @@ public class AwSettingsTest extends AwTestBase {
|
| helper.ensureSettingHasInitialValue();
|
| }
|
|
|
| - /**
|
| - * @SmallTest
|
| - * @Feature({"AndroidWebView", "Preferences"})
|
| - * crbug.com/277077
|
| - */
|
| - @DisabledTest
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| public void testUniversalAccessFromFilesWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| runPerViewSettingsTest(
|
| @@ -1638,12 +1630,8 @@ public class AwSettingsTest extends AwTestBase {
|
|
|
| // This test verifies that local image resources can be loaded from file:
|
| // URLs regardless of file access state.
|
| - /**
|
| - * @SmallTest
|
| - * @Feature({"AndroidWebView", "Preferences"})
|
| - * crbug.com/277077
|
| - */
|
| - @DisabledTest
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| public void testFileAccessFromFilesImage() throws Throwable {
|
| final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
|
| final String imageHeight = "16";
|
| @@ -1659,12 +1647,8 @@ public class AwSettingsTest extends AwTestBase {
|
| assertEquals(imageHeight, getTitleOnUiThread(awContents));
|
| }
|
|
|
| - /**
|
| - * @SmallTest
|
| - * @Feature({"AndroidWebView", "Preferences"})
|
| - * crbug.com/277077
|
| - */
|
| - @DisabledTest
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| public void testFileAccessFromFilesIframeWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| runPerViewSettingsTest(
|
| @@ -1674,12 +1658,8 @@ public class AwSettingsTest extends AwTestBase {
|
| views.getContents1(), views.getClient1()));
|
| }
|
|
|
| - /**
|
| - * @SmallTest
|
| - * @Feature({"AndroidWebView", "Preferences"})
|
| - * crbug.com/277077
|
| - */
|
| - @DisabledTest
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| public void testFileAccessFromFilesXhrWithTwoViews() throws Throwable {
|
| ViewPair views = createViews();
|
| runPerViewSettingsTest(
|
|
|