Define a variable to distinguish system_icu from bundled_icu in Blink

LayoutTests/fast/encoding/char-decoding.html

Index: LayoutTests/fast/encoding/char-decoding.html
diff --git a/LayoutTests/fast/encoding/char-decoding.html b/LayoutTests/fast/encoding/char-decoding.html
index 5ac47ad1f94fdef4295bb8af7587ca13740d00df..0a0acad77929c6a388372ca375d0d8b6833a119d 100644
--- a/LayoutTests/fast/encoding/char-decoding.html
+++ b/LayoutTests/fast/encoding/char-decoding.html
@@ -10,21 +10,44 @@ description("This tests decoding characters in various character sets.");
 
 testDecode('UTF-8', '%E2%88%9A', 'U+221A');
 
-// <http://bugs.webkit.org/show_bug.cgi?id=17014> EUC-CN code A3A0 is mapped to U+E5E5 instead of U+3000
+// \xA3\xA0 in GBK should be mapped to U+3000 instead of U+E5E5.
 testDecode('gb2312', '%A3%A0', 'U+3000');
+testDecode('gb_2312', '%A3%A0', 'U+3000');
 testDecode('gb_2312-80', '%A3%A0', 'U+3000');
+testDecode('csgb2312', '%A3%A0', 'U+3000');
+testDecode('iso-ir-58', '%A3%A0', 'U+3000');
+testDecode('csiso58gb231280', '%A3%A0', 'U+3000');
 testDecode('chinese', '%A3%A0', 'U+3000');
 testDecode('gbk', '%A3%A0', 'U+3000');
+testDecode('x-gbk', '%A3%A0', 'U+3000');
 testDecode('gb18030', '%A3%A0', 'U+3000');
 testDecode('EUC-CN', '%A3%A0', 'U+3000');
 
+// Align GBK with GB18030
+testDecode('gbk', '%A8%BF', 'U+01F9');
+testDecode('gbk', '%A1%AD', 'U+2026');
+testDecode('gbk', '%A1%AB', 'U+FF5E');
+testDecode('gb18030', '%A8%BF', 'U+01F9');
+testDecode('gb18030', '%A8%BC', 'U+1E3F');
+testDecode('gb18030', '%A1%AD', 'U+2026');
+testDecode('gb18030', '%A1%AB', 'U+FF5E');
+
+// Replace U+E7C7 with U+1E3F once
+// https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3 is resolved.
+testDecode('gbk', '%A8%BC', 'U+E7C7');
+
 // Test Shift_JIS aliases.
 testDecode('Shift_JIS', '%82%d0', 'U+3072');
 testDecode('shift-jis', '%82%d0', 'U+3072');
+testDecode('csshiftjis', '%82%d0', 'U+3072');
+testDecode('sjis', '%82%d0', 'U+3072');
+testDecode('x-sjis', '%82%d0', 'U+3072');
+testDecode('ms_kanji', '%82%d0', 'U+3072');
+testDecode('windows-31j', '%82%d0', 'U+3072');
 
 // Test that all Korean encodings of EUC-KR family are treated as windows-949.
 var korean = {
-    encodings: ['korean', 'EUC-KR', 'windows-949', 'x-windows-949', 'x-uhc',
+    encodings: ['korean', 'EUC-KR', 'windows-949', 'cseuckr', 'csksc56011987',
                 'iso-ir-149', 'KS_C_5601-1987', 'KS_C_5601-1989',
                 'KSC5601', 'KSC_5601'],
     encoded: ['%A2%E6', '%A1%A4', '%A1%A9', '%A1%AA', '%A1%AD', '%A2%A6',