| Index: chrome/browser/browser_encoding_browsertest.cc
|
| diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
|
| index e4911dbb03d3dd4251b30f9551dc6ee69cc09040..eadbfec6b2d899e8d2549a90a3c5dc69516c4b89 100644
|
| --- a/chrome/browser/browser_encoding_browsertest.cc
|
| +++ b/chrome/browser/browser_encoding_browsertest.cc
|
| @@ -53,8 +53,12 @@ const EncodingTestData kEncodingTestDatas[] = {
|
| { "UTF-8.html", "UTF-8" },
|
| { "UTF-16LE.html", "UTF-16LE" },
|
| { "windows-874.html", "windows-874" },
|
| - // http://crbug.com/95963
|
| - // { "windows-949.html", "windows-949" },
|
| +#if 0
|
| + // TODO(jungshik): Temporarily disable this. Reenable it once
|
| + // Blink rolls to include https://codereview.chromium.org/25870005/
|
| + // (it's reverted so that it has to be landed again).
|
| + { "EUC-KR.html", "EUC-KR" },
|
| +#endif
|
| { "windows-1250.html", "windows-1250" },
|
| { "windows-1251.html", "windows-1251" },
|
| { "windows-1252.html", "windows-1252" },
|
| @@ -265,9 +269,14 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
|
| { "UTF-8_with_no_encoding_specified.html",
|
| "expected_UTF-8_saved_from_no_encoding_specified.html",
|
| "UTF-8" },
|
| - { "windows-949_with_no_encoding_specified.html",
|
| - "expected_windows-949_saved_from_no_encoding_specified.html",
|
| - "windows-949-2000" },
|
| +#if 0
|
| + // TODO(jungshik): Temporarily disable this. Reenable it once
|
| + // Blink rolls to include https://codereview.chromium.org/25870005/
|
| + // (it's reverted so that it has to be landed again).
|
| + { "EUC-KR_with_no_encoding_specified.html",
|
| + "expected_EUC-KR_saved_from_no_encoding_specified.html",
|
| + "EUC-KR" },
|
| +#endif
|
| { "windows-1251_with_no_encoding_specified.html",
|
| "expected_windows-1251_saved_from_no_encoding_specified.html",
|
| "windows-1251" },
|
|
|