summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests/src/org/chromium
diff options
context:
space:
mode:
authorphilipj <philipj@opera.com>2016-02-18 07:35:15 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-18 15:36:15 +0000
commit0bb2dcd18efa71df5a93c7a5f4075cb876fa2f86 (patch)
tree140959edb5aaea4ff476bc9a0dbda6ccca131134 /android_webview/javatests/src/org/chromium
parente7071a0d8d5dad9a3f0cb803b10403b4107aeda5 (diff)
downloadchromium_src-0bb2dcd18efa71df5a93c7a5f4075cb876fa2f86.zip
chromium_src-0bb2dcd18efa71df5a93c7a5f4075cb876fa2f86.tar.gz
chromium_src-0bb2dcd18efa71df5a93c7a5f4075cb876fa2f86.tar.bz2
Remove document.defaultCharset
Intent to Deprecate and Remove: https://groups.google.com/a/chromium.org/d/msg/blink-dev/pWSb_tq13Kg/Dmk59Fb9AQAJ The removed Android test depended on defaultCharset. There is already another test that verifies that the setting affects the default encoding: LayoutTests/http/tests/download/default-encoding.html BUG=567738 Review URL: https://codereview.chromium.org/1707473002 Cr-Commit-Position: refs/heads/master@{#376170}
Diffstat (limited to 'android_webview/javatests/src/org/chromium')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java9
1 files changed, 7 insertions, 2 deletions
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 a9643c8..e8e6a38 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
@@ -29,6 +29,7 @@ import org.chromium.android_webview.test.util.CommonResources;
import org.chromium.android_webview.test.util.ImagePageGenerator;
import org.chromium.android_webview.test.util.VideoTestUtil;
import org.chromium.android_webview.test.util.VideoTestWebServer;
+import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.TestFileUtil;
import org.chromium.base.test.util.UrlUtils;
@@ -1603,8 +1604,12 @@ public class AwSettingsTest extends AwTestBase {
views.getContainer1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
- @SmallTest
- @Feature({"AndroidWebView", "Preferences"})
+ /*
+ * Disabled due to document.defaultCharset removal. crbug.com/587484
+ * @SmallTest
+ * @Feature({"AndroidWebView", "Preferences"})
+ */
+ @DisabledTest
public void testDefaultTextEncodingWithTwoViews() throws Throwable {
ViewPair views = createViews();
runPerViewSettingsTest(