Remove document.defaultCharset

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.graphics.Point;
 import android.net.http.SslError;
 import android.os.Build;
@@ skipping 11 matching lines @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.AwWebResourceResponse;
 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;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.HistoryUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.test.util.TestWebServer;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
@@ skipping 1554 matching lines @@
     @Feature({"AndroidWebView", "Preferences"})
     public void testLoadsImagesAutomaticallyWithTwoViews() throws Throwable {
         ViewPair views = createViews();
         runPerViewSettingsTest(
                 new AwSettingsLoadImagesAutomaticallyTestHelper(
                     views.getContainer0(), views.getClient0(), new ImagePageGenerator(0, true)),
                 new AwSettingsLoadImagesAutomaticallyTestHelper(
                     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(
                 new AwSettingsDefaultTextEncodingTestHelper(
                         views.getContainer0(), views.getClient0()),
                 new AwSettingsDefaultTextEncodingTestHelper(
                         views.getContainer1(), views.getClient1()));
     }
 
     // The test verifies that the default user agent string follows the format
@@ skipping 1391 matching lines @@
         final AwContents awContents = webView.getAwContents();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 awContents.getContentViewCore().sendDoubleTapForTest(
                         SystemClock.uptimeMillis(), x, y);
             }
         });
     }
 }