Drop Big5-HKSCS and add IBM866 in the encoding menu.

The HTML encoding spec unified Big5 and Big5-HKSCS and we're not
distinguishing them any more.

The spec also has IBM866 that is not in the menu, yet.

BUG=None
TEST=manual:
1. load a page in ibm866 and check the encoding in More Tools|Encoding.
2. load pages labelled as in Big5 and Big5-HKSCS and check the encoding.
TEST=browser_tests --gtest_filter=*ncodin*
TEST=unit_tests --gtest_filter EncodingMenu*

Review URL: https://codereview.chromium.org/1024713002

Cr-Commit-Position: refs/heads/master@{#322068}

chrome/app/chrome_command_ids.h

@@ -94,40 +94,40 @@
 #define IDC_ENCODING_AUTO_DETECT        35500
 #define IDC_ENCODING_UTF8               35501
 #define IDC_ENCODING_UTF16LE            35502
-#define IDC_ENCODING_WINDOWS1252        35504
-#define IDC_ENCODING_GBK                35505
-#define IDC_ENCODING_GB18030            35506
-#define IDC_ENCODING_BIG5               35507
-#define IDC_ENCODING_BIG5HKSCS          35508
-#define IDC_ENCODING_KOREAN             35509
-#define IDC_ENCODING_SHIFTJIS           35510
-#define IDC_ENCODING_ISO2022JP          35511
-#define IDC_ENCODING_EUCJP              35512
-#define IDC_ENCODING_THAI               35513
-#define IDC_ENCODING_ISO885915          35514
-#define IDC_ENCODING_MACINTOSH          35515
-#define IDC_ENCODING_ISO88592           35516
-#define IDC_ENCODING_WINDOWS1250        35517
-#define IDC_ENCODING_ISO88595           35518
-#define IDC_ENCODING_WINDOWS1251        35519
-#define IDC_ENCODING_KOI8R              35520
-#define IDC_ENCODING_KOI8U              35521
-#define IDC_ENCODING_ISO88597           35522
-#define IDC_ENCODING_WINDOWS1253        35523
-#define IDC_ENCODING_ISO88594           35524
-#define IDC_ENCODING_ISO885913          35525
-#define IDC_ENCODING_WINDOWS1257        35526
-#define IDC_ENCODING_ISO88593           35527
-#define IDC_ENCODING_ISO885910          35528
-#define IDC_ENCODING_ISO885914          35529
-#define IDC_ENCODING_ISO885916          35530
-#define IDC_ENCODING_WINDOWS1254        35531
-#define IDC_ENCODING_ISO88596           35532
-#define IDC_ENCODING_WINDOWS1256        35533
-#define IDC_ENCODING_ISO88598           35534
-#define IDC_ENCODING_WINDOWS1255        35535
-#define IDC_ENCODING_WINDOWS1258        35536
-#define IDC_ENCODING_ISO88598I          35537
+#define IDC_ENCODING_WINDOWS1252        35503
+#define IDC_ENCODING_GBK                35504
+#define IDC_ENCODING_GB18030            35505
+#define IDC_ENCODING_BIG5               35506
+#define IDC_ENCODING_KOREAN             35507
+#define IDC_ENCODING_SHIFTJIS           35508
+#define IDC_ENCODING_ISO2022JP          35509
+#define IDC_ENCODING_EUCJP              35510
+#define IDC_ENCODING_THAI               35511
+#define IDC_ENCODING_ISO885915          35512
+#define IDC_ENCODING_MACINTOSH          35513
+#define IDC_ENCODING_ISO88592           35514
+#define IDC_ENCODING_WINDOWS1250        35515
+#define IDC_ENCODING_ISO88595           35516
+#define IDC_ENCODING_WINDOWS1251        35517
+#define IDC_ENCODING_KOI8R              35518
+#define IDC_ENCODING_KOI8U              35519
+#define IDC_ENCODING_ISO88597           35520
+#define IDC_ENCODING_WINDOWS1253        35521
+#define IDC_ENCODING_ISO88594           35522
+#define IDC_ENCODING_ISO885913          35523
+#define IDC_ENCODING_WINDOWS1257        35524
+#define IDC_ENCODING_ISO88593           35525
+#define IDC_ENCODING_ISO885910          35526
+#define IDC_ENCODING_ISO885914          35527
+#define IDC_ENCODING_ISO885916          35528
+#define IDC_ENCODING_WINDOWS1254        35529
+#define IDC_ENCODING_ISO88596           35530
+#define IDC_ENCODING_WINDOWS1256        35531
+#define IDC_ENCODING_ISO88598           35532
+#define IDC_ENCODING_WINDOWS1255        35533
+#define IDC_ENCODING_WINDOWS1258        35534
+#define IDC_ENCODING_ISO88598I          35535
+#define IDC_ENCODING_IBM866             35536
 
 // Clipboard commands
 #define IDC_CUT                         36000

chrome/browser/character_encoding.cc

@@ -40,7 +40,6 @@ const CanonicalEncodingData kCanonicalEncodingNames[] = {
   { IDC_ENCODING_GBK, "GBK", IDS_ENCODING_SIMP_CHINESE },
   { 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, "EUC-KR", IDS_ENCODING_KOREAN },
   { IDC_ENCODING_SHIFTJIS, "Shift_JIS", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_EUCJP, "EUC-JP", IDS_ENCODING_JAPANESE },
@@ -54,6 +53,7 @@ const CanonicalEncodingData kCanonicalEncodingNames[] = {
   { IDC_ENCODING_WINDOWS1251, "windows-1251", IDS_ENCODING_CYRILLIC },
   { IDC_ENCODING_KOI8R, "KOI8-R", IDS_ENCODING_CYRILLIC },
   { IDC_ENCODING_KOI8U, "KOI8-U", IDS_ENCODING_CYRILLIC },
+  { IDC_ENCODING_IBM866, "IBM866", IDS_ENCODING_CYRILLIC },
   { IDC_ENCODING_ISO88597, "ISO-8859-7", IDS_ENCODING_GREEK },
   { IDC_ENCODING_WINDOWS1253, "windows-1253", IDS_ENCODING_GREEK },
   { IDC_ENCODING_WINDOWS1254, "windows-1254", IDS_ENCODING_TURKISH },
@@ -194,7 +194,6 @@ const int kDefaultEncodingMenus[] = {
   IDC_ENCODING_GBK,
   IDC_ENCODING_GB18030,
   IDC_ENCODING_BIG5,
-  IDC_ENCODING_BIG5HKSCS,
   IDC_ENCODING_KOREAN,
   IDC_ENCODING_SHIFTJIS,
   IDC_ENCODING_EUCJP,
@@ -208,6 +207,7 @@ const int kDefaultEncodingMenus[] = {
   IDC_ENCODING_WINDOWS1251,
   IDC_ENCODING_KOI8R,
   IDC_ENCODING_KOI8U,
+  IDC_ENCODING_IBM866,
   IDC_ENCODING_ISO88597,
   IDC_ENCODING_WINDOWS1253,
   IDC_ENCODING_WINDOWS1254,

chrome/browser/ui/browser_command_controller.cc

@@ -570,7 +570,6 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
     case IDC_ENCODING_WINDOWS1252:
     case IDC_ENCODING_GBK:
     case IDC_ENCODING_GB18030:
-    case IDC_ENCODING_BIG5HKSCS:
     case IDC_ENCODING_BIG5:
     case IDC_ENCODING_KOREAN:
     case IDC_ENCODING_SHIFTJIS:
@@ -585,6 +584,7 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
     case IDC_ENCODING_WINDOWS1251:
     case IDC_ENCODING_KOI8R:
     case IDC_ENCODING_KOI8U:
+    case IDC_ENCODING_IBM866:
     case IDC_ENCODING_ISO88597:
     case IDC_ENCODING_WINDOWS1253:
     case IDC_ENCODING_ISO88594:
@@ -919,7 +919,6 @@ void BrowserCommandController::InitCommandState() {
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_GBK, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_GB18030, true);
-  command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5HKSCS, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_BIG5, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_THAI, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOREAN, true);
@@ -934,6 +933,7 @@ void BrowserCommandController::InitCommandState() {
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1251, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOI8R, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_KOI8U, true);
+  command_updater_.UpdateCommandEnabled(IDC_ENCODING_IBM866, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88597, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1253, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88594, true);

chrome/browser/ui/toolbar/encoding_menu_controller.cc

@@ -22,7 +22,6 @@ const int EncodingMenuController::kValidEncodingIds[] = {
     IDC_ENCODING_GBK,
     IDC_ENCODING_GB18030,
     IDC_ENCODING_BIG5,
-    IDC_ENCODING_BIG5HKSCS,
     IDC_ENCODING_KOREAN,
     IDC_ENCODING_SHIFTJIS,
     IDC_ENCODING_ISO2022JP,
@@ -52,6 +51,7 @@ const int EncodingMenuController::kValidEncodingIds[] = {
     IDC_ENCODING_WINDOWS1255,
     IDC_ENCODING_WINDOWS1258,
     IDC_ENCODING_ISO88598I,
+    IDC_ENCODING_IBM866,
 };
 
 bool EncodingMenuController::DoesCommandBelongToEncodingMenu(int id) {