Canonical encoding name : windows-949 => EUC-KR

This is the chromium side of a blink change at https://codereview.chromium.org/25870005 Until the corresponding blink CL above is re-landed (it's landed but reverted), disable EUC-KR-related test temporarily. This is a copy of https://codereview.chromium.org/25769005/ (lgtm'd and approved). BUG=277027, 95963 TEST=browser test: BrowserEncodingTest.* and EncodingAlias*. TBR=thakis,robertshield Review URL: https://codereview.chromium.org/26439002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227506 0039d316-1c4b-4281-b951-d872f2087c98
SaschaDeWaal · Oct 8, 2013 · 50f9185 · 50f9185
1 parent 5590c6f
commit 50f9185
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git 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" },

diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
@@ -42,7 +42,7 @@ const CanonicalEncodingData kCanonicalEncodingNames[] = {
   { IDC_ENCODING_GB18030, "gb18030", IDS_ENCODING_SIMP_CHINESE },
   { IDC_ENCODING_BIG5, "Big5", IDS_ENCODING_TRAD_CHINESE },
   { IDC_ENCODING_BIG5HKSCS, "Big5-HKSCS", IDS_ENCODING_TRAD_CHINESE },
-  { IDC_ENCODING_KOREAN, "windows-949", IDS_ENCODING_KOREAN },
+  { IDC_ENCODING_KOREAN, "EUC-KR", IDS_ENCODING_KOREAN },
   { IDC_ENCODING_SHIFTJIS, "Shift_JIS", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_EUCJP, "EUC-JP", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_ISO2022JP, "ISO-2022-JP", IDS_ENCODING_JAPANESE },
@@ -88,7 +88,6 @@ const CanonicalEncodingDisplayNamePair kCanonicalDisplayNameOverrides[] = {
   // Only lists the canonical names where we want a different form for display.
   { "macintosh", "Macintosh" },
   { "windows-874", "Windows-874" },
-  { "windows-949", "Windows-949" },
   { "windows-1250", "Windows-1250" },
   { "windows-1251", "Windows-1251" },
   { "windows-1252", "Windows-1252" },

diff --git a/...ding_tests/alias_mapping/windows-949.html → .../encoding_tests/alias_mapping/EUC-KR.html b/...ding_tests/alias_mapping/windows-949.html → .../encoding_tests/alias_mapping/EUC-KR.html
@@ -1,7 +1,7 @@
 <html>
  <head>
-  <title> windows-949 </title>
-  <meta http-equiv="Content-Type" content="text/html; charset=windows-949" />
+  <title> EUC-KR </title>
+  <meta http-equiv="Content-Type" content="text/html; charset=EUC-KR" />
  </head>
 
  <body>

diff --git a/...ndows-949_with_no_encoding_specified.html → ...ct/EUC-KR_with_no_encoding_specified.html b/...ndows-949_with_no_encoding_specified.html → ...ct/EUC-KR_with_no_encoding_specified.html
@@ -1,6 +1,6 @@
 <html>
  <head>
-  <title> windows-949 </title>
+  <title> EUC-KR </title>
  </head>
 
  <body>

diff --git a/...949_saved_from_no_encoding_specified.html → ...-KR_saved_from_no_encoding_specified.html b/...949_saved_from_no_encoding_specified.html → ...-KR_saved_from_no_encoding_specified.html
@@ -1,7 +1,7 @@
 
-<!-- saved from url=(0087)http://mock.http/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-949">
-  <title> windows-949 </title>
+<!-- saved from url=(0082)http://mock.http/encoding_tests/auto_detect/EUC-KR_with_no_encoding_specified.html -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=EUC-KR">
+  <title> EUC-KR </title>
  </head>
 
  <body>

diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
@@ -91,7 +91,7 @@ class ChromeActiveDocument;
   V(INTERNAL_IE_ENCODINGMENU_JAPAN_AUTOSELECT, 3634, "ISO-2022-JP") \
   V(INTERNAL_IE_ENCODINGMENU_JAPAN_EUC, 3635, "EUC-JP") \
   V(INTERNAL_IE_ENCODINGMENU_JAPAN_SHIFT_JIS, 3636, "Shift_JIS") \
-  V(INTERNAL_IE_ENCODINGMENU_KOREA, 3637, "windows-949") \
+  V(INTERNAL_IE_ENCODINGMENU_KOREA, 3637, "EUC-KR") \
   V(INTERNAL_IE_ENCODINGMENU_THAI, 3638, "windows-874") \
   V(INTERNAL_IE_ENCODINGMENU_TURKISH_ISO, 3639, "windows-1254") \
   V(INTERNAL_IE_ENCODINGMENU_TURKISH_WINDOWS, 3640, "windows-1254") \