[chromium-checkins] r45274 - in trunk/src: . chrome/test/data/encoding_tests/alias_mapping chrome/test/data/encoding_tests/auto_detect chrome/test/data/encoding_tests/auto_detect/expected_results chrome/test/data/encoding_tests/user_override chrome/test/data/save_page chrome/test/ui webkit/glue

2 views
Skip to first unread message

jam...@chromium.org

unread,
Apr 21, 2010, 9:26:16 PM4/21/10
to chromium...@chromium.org
Author: jam...@chromium.org
Date: Wed Apr 21 18:26:15 2010
New Revision: 45274

Log:
Update WebKit to r58033

Review URL: http://codereview.chromium.org/1705004

Modified:
trunk/src/DEPS
trunk/src/chrome/test/data/encoding_tests/alias_mapping/Big5.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/EUC-JP.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-13.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-15.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-2.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-4.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-5.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-6.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-7.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-8.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-R.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-U.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/Shift-JIS.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/US-ASCII.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/UTF-8.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/gb18030.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/iso-8859-1.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/macintosh.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1250.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1251.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1252.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1253.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1254.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1255.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1256.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1257.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1258.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-874.html
trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-949.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-5_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-6_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-7_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-8_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/KOI8-R_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/Shift-JIS_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/UTF-8_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Big5_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-5_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-6_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-7_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-8_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_KOI8-R_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Shift-JIS_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_UTF-8_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_iso-8859-1_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1251_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1254_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1255_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1256_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/gb18030_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/iso-8859-1_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1251_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1254_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1255_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1256_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html
trunk/src/chrome/test/data/encoding_tests/user_override/expected_gb18030_saved_from_iso88591_meta.html
trunk/src/chrome/test/data/encoding_tests/user_override/gb18030_with_iso88591_meta.html
trunk/src/chrome/test/data/save_page/b.saved1.htm
trunk/src/chrome/test/data/save_page/b.saved2.htm
trunk/src/chrome/test/ui/ui_test.cc
trunk/src/webkit/glue/dom_serializer_unittest.cc

Modified: trunk/src/DEPS
==============================================================================
--- trunk/src/DEPS (original)
+++ trunk/src/DEPS Wed Apr 21 18:26:15 2010
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "58013",
+ "webkit_revision": "58033",
"ffmpeg_revision": "43776",
"skia_revision": "524",
"chromium_git": "http://src.chromium.org/git",

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/Big5.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/Big5.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/Big5.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> Big5 </TITLE>
+<html>
+ <head>
+ <title> Big5 </title>
<meta http-equiv="Content-Type" content="text/html; charset=Big5" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
┮琎ぱ┾琩玡羆参朝┬まㄓ眏疨ぃ骸┮よノ瞒穦癸陆絚耫胔好琌ㄓ贝留╬硓筁畍┮笷腨タк某

┮琎ぱミ坚睲琩┬琌ㄒ︽そㄆゼ朝┬ずΤ┮孔陆絚耫┾琩挡狦ゼ祇瞷笻砏珇ゼ盿ǐヴゅン┬ずΤ菏跌竟魁紇ち常Τ魁琩
@@ -12,6 +12,6 @@
┮捌┮λ眏秸蝴臔Μ甧–ぱ常穦ぃ﹚ぃ﹚翴┾琩┬琎ぱと┾琩朝玡羆参┬朝タ籔ミ〆襖眶疭钡ǎ钡帝皑琌畍穦ǎㄓぃの朝┾琩ㄆ

畍綠ゅ纒玥弧朝к某琩┬獻デ留╬踞みк臛ゅ穦胣┪ア萝琎ぱぃ幢рюň戈ユ倒磷ず甧胣某ら畑拦竛笷↖纐к某ボ穦σ納
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/EUC-JP.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/EUC-JP.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/EUC-JP.html Wed Apr 21 18:26:15 2010
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
<title>EUC-JP</title>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-13.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-13.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-13.html Wed Apr 21 18:26:15 2010
@@ -1,15 +1,15 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-13 </TITLE>
+<html>
+ <head>
+ <title> ISO-8859-13 </title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-13" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
、¥ウЖ┆
氨渤吹斗腹夯冀究
懒旅呐魄壬仕掏蜗
醒矣哉肿刭谯茌捱
噌忏溴骁栝觌祉铒
瘃蝮趱鲼�
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-15.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-15.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-15.html Wed Apr 21 18:26:15 2010
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
<title>ISO-8859-15</title>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-2.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-2.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-2.html Wed Apr 21 18:26:15 2010
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
<title>ISO-8859-2</title>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-4.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-4.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-4.html Wed Apr 21 18:26:15 2010
@@ -1,15 +1,15 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-4 </TITLE>
+<html>
+ <head>
+ <title> ISO-8859-4 </title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-4" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
、¥ウЖ┆
氨渤吹斗购患骄� 懒旅呐魄壬仕掏蜗
醒矣哉肿刭谯茌捱
噌忏溴骁栝觌祉铒
瘃蝮趱鲼�
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-5.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-5.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-5.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-5 </TITLE>
+<html>
+ <head>
+ <title> ISO-8859-5 </title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-5" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
季梁舶, 9 镙�- 栏�睫肄徕� 叫哉衷�菪 嘈奏砧蛰卣 �唢廨劓�卩刈蒯��忄休棕廪�噢後刭嶷抻�有仔 �狄噢咩 缯嗾�庹噜剽捺仡 泌嘈剌�咿谛 菡 捱嘈以雄蒯� 稿 咿镆壅葚�徇掎扪徕肄倚坌 剌滢嘬墟仫 �徂盂嗅刎 阙嘈剌嶷拶 徕捺掭�菪 徂自休卣 苷衷爿朽拊蒉�苻葚廪嘭萦抟拶 碲徇锗廨拶 谵茇後刎 �沌嗅庳哲 哙赵徕幸剽折召 "承走噢苄", 拊菪谵 艺缯噢�徕雄�刈艺徕蒉, 玮�贺找 咿-哙罩菡茔 徕幸剽 庑谵�滢嘬锈 苷逍葚总�谵葩噢埏 仔 忄休棕廪�咿�徂茌蛰卣. 擂後仫 愚廪倚 肄邹演抟剽�译葶衷蛰蒉 哙锗倚葺胝 砸�暂�菪仔�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-6.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-6.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-6.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-6 </TITLE>
+<html>
+ <head>
+ <title> ISO-8859-6 </title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-6" />
- </HEAD>
+ </head>

- <BODY dir="RTL">
+ <body dir="RTL">
觅滏�闶瞧�卿早晗 僖 卿详�卿庥清 卿醒琴 卿儆阊�渫雁�/湾怯/ 冁 馐�隋擎晟 彐 替柘 卿峭输卿 卿庞亚脐潢 逵橇 卿觇�卿体偕 彡 峭�卿彐且�热湎�汝�淝珀�藻卿 庾琴 谝�. 桠卿�卿闶瞧�彡 汝擎 嗜媸 彡�卿缣桢 " 擎�栳�馘潢�吻揍�桄栀晟�叔沔�闶瞧�卿早晗 僖 卿详�卿庥清 彡 卿忧偕 16:20 彐 氢释清 彐忆 晖输�卿替柘 卿庞亚脐潢赕 彡 完 卿愉亲赕 彡 汝�淝珀�藻卿 谘�庾琴 谝�" . 枨智�卿汝擎 " 面 忤�吻丈 彐 闶瞧�卿庥清 氢释迨 卿彐忆 盟媲�疏翘�傧�彐 卿替柘 桠�锰缫 卿逄晴翔�黉�卿忤�仍沅 闱邃�枨涫�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-7.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-7.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-7.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-7 </TITLE>
+<html>
+ <head>
+ <title> ISO-8859-7 </title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-7" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
体 镬殡哚 翮�篝�贻眙耧 痫腚狃膻�黢摅妁�麸�霓祜�嗅脶燔 梳皲唪筢�镫镪朕聩箦 翮�溟揿羼�疱耖镤暹�翮�篝珥 梳皲唪筢 �沐黹贽 泷犰灬糨狎 麸�适�� 岭蓐�嗅疳褶汜. �� 嗅疳褶汜 贶脲箦 麸躜 徙顸翦�磲 蹰镨弭摅秕�糸�栎箦轵 麸�适�汩�麸 徙耧糸挈, ...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-8.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-8.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/ISO-8859-8.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-8 </TITLE>
+<html>
+ <head>
+ <title> ISO-8859-8 </title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-8" />
- </HEAD>
+ </head>

<body dir="rtl">
犷麽殪 扉狷 澉衢痂 痄 徜珈楮 铄蝣�溽殍珏�祺�熹赳鼹 帙 铋殂辁, 铖铒 "�帔 蝾泮� "囿 忮 玳鲥痖 爨 轺狎 帔 骐妃疱 熹怙 蜢 噫轲� 鲣"�轭�後轹弪 漕铄�彖戾 蜢殄". 噱祛 溴耖�遴铠 腴 溟 溽鬻�铗驿 "铄腴�珈楮 溧��爨 彘���帏忮痖 滂� 犷麽殪 扉狷 澉衢痂 漕汩痖-衢桤屦�殚铤 蜢 �溏扈�铄蝣�溽殍珏� 溧��潇殪��扉囔 熹赳轺 帔 潇玳钿 狲鲥蝥 蜴�- 囝�狯澍殚�(�) �漕铢熹, 噤邈 噱祛, 腴 "钹�孱蝈祉 钽轲�轾�爨 漶腴钿 屙 忮 玳鲥痖 轺狎 帔 骐妃�...
</body>
-</HTML>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-R.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-R.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-R.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> KOI8-R </TITLE>
+<html>
+ <head>
+ <title> KOI8-R </title>
<meta http-equiv="Content-Type" content="text/html; charset=KOI8-R" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
盹箅麽, 9 盐�- 蜷�钕紫釉� 盍呐帜�瘟 伊谝袍盼膳 �醒晕擅�艘哨捎��砸廖谏韵�蚁佑墒铀锨�橇诹 �遄蚁姓 夼遗�耘乙稍弦衫 跛伊晌�邢肆 闻 闲伊啄撂捎� 槿 邢炎膛紊�有嫌下釉紫琢塘 晌葡彝撩裳 �酉翘劣缮 账伊晌铀鲜 釉弦衔�瘟 酉谀廖膳 团帜瘴烈夏蜗�拖紊韵疑吻献鲜 芩有乓晕鲜 讼蜕佑缮 �辙劣陨磐 幸拍釉磷稍盘攀 "缌谛蚁土", 夏瘟讼 着夼蚁�釉撂�哨着釉蜗, 拊�肷抛 邢-幸胖闻驼 釉磷稍 粤讼�葡彝猎 团攘紊谕�讼卧蚁萄 诹 砸廖谏韵�邢�酉臀盼膳. 蛳佑裳 窍韵琢 紫谙挛献稍�踪握帜盼蜗 幸乓琢挝倥 淖�奈�瘟诹�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-U.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-U.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/KOI8-U.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> KOI8-U </TITLE>
+<html>
+ <head>
+ <title> KOI8-U </title>
<meta http-equiv="Content-Type" content="text/html; charset=KOI8-U" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
盹箅麽, 9 盐�- 蜷�钕紫釉� 盍呐帜�瘟 伊谝袍盼膳 �醒晕擅�艘哨捎��砸廖谏韵�蚁佑墒铀锨�橇诹 �遄蚁姓 夼遗�耘乙稍弦衫 跛伊晌�邢肆 闻 闲伊啄撂捎� 槿 邢炎膛紊�有嫌下釉紫琢塘 晌葡彝撩裳 �酉翘劣缮 账伊晌铀鲜 釉弦衔�瘟 酉谀廖膳 团帜瘴烈夏蜗�拖紊韵疑吻献鲜 芩有乓晕鲜 讼蜕佑缮 �辙劣陨磐 幸拍釉磷稍盘攀 "缌谛蚁土", 夏瘟讼 着夼蚁�釉撂�哨着釉蜗, 拊�肷抛 邢-幸胖闻驼 釉磷稍 粤讼�葡彝猎 团攘紊谕�讼卧蚁萄 诹 砸廖谏韵�邢�酉臀盼膳. 蛳佑裳 窍韵琢 紫谙挛献稍�踪握帜盼蜗 幸乓琢挝倥 淖�奈�瘟诹�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/Shift-JIS.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/Shift-JIS.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/Shift-JIS.html Wed Apr 21 18:26:15 2010
@@ -1,12 +1,12 @@
-<HTML>
- <HEAD>
- <TITLE> Shift_JIS </TITLE>
+<html>
+ <head>
+ <title> Shift_JIS </title>
<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
廜堾媍堾塣塩埾堳夛偼俋擔屵屻偺棟帠夛偱丄侾俁擔偵杮夛媍傪奐偒丄俀挍墌偺掕妟媼晅嬥傪惙傝崬傫偩俀侽侽俉擭搙戞俀師曗惓梊嶼埬偲娭楢朄埬傪嵦寛偡傞偙偲傪彫嶁寷師埾堳挿偺怑尃偱寛傔偨丅梌搣偺巀惉懡悢偱壜寛丄嶲堾偵憲晅偝傟傞丅柉庡搣偼乽媼晅嬥偺媍榑偑晄廫暘乿偲斀敪丄嶲堾怰媍偵偼摉柺墳偠側偄曽恓丅嵦寛偱偼丄媼晅嬥傊偺晄枮偑偔偡傇傞帺柉搣撪偐傜憿斀幰偑弌傞壜擻惈傕偁傝丄崱崙夛偼嵟弶偺儎儅応傪寎偊傞丅
丂廜堾媍塣埾偵愭棫偪丄廜堾梊嶼埾堳夛偼棟帠夛偱丄侾俁擔偵俀師曗惓偺掲傔偔偔傝幙媈傪峴偄嵦寛偡傞偙偲傪寛傔偨丅嵿柋嬥梈丄憤柋丄崙搚岎捠偺奺埾堳夛傕棟帠夛側偳傪奐偒丄掕妟媼晅嬥側偳偺嵿尮偲偟偰嵿惌搳梈帒摿暿夛寁偐傜係挍墌傪堦斒夛寁偵孞傝擖傟傞摿椺朄埬側偳偺娭楢朄埬傪丄摨擔拞偵嵦寛偡傞偙偲傪寛掕丅偄偢傟傕杮夛媍偵嬞媫忋掱偝傟丄壜寛偝傟傞塣傃偩丅
丂偙傟偵懳偟丄柉庡搣偼俋擔屵屻丄搣杮晹偱彫戲堦榊戙昞傜偑弌惾偟偰姴晹夛傪奐偒丄俀師曗惓傊偺懳墳偵偮偄偰(1)侾俁擔偺廜堾梊嶼埾偲杮夛媍偵偼弌惾偟丄嵦寛捈慜偵戅惾側偳偟偰峈媍偡傞(2)嶲堾偱偺怰媍偼摉柺嫅斲偡傞亅偙偲傪寛傔偨丅
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/US-ASCII.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/US-ASCII.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/US-ASCII.html Wed Apr 21 18:26:15 2010
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
-<HTML lang=en-US xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
-<HEAD profile=http://www.w3.org/2000/08/w3c-synd/#>
-<TITLE>World Wide Web Consortium - Web Standards</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=us-ascii">
-</HEAD>
-<BODY>
-<H1><IMG height=48 alt="The World Wide Web Consortium (W3C)" src="" width=315></H1>
-<H2>The encoding of the contents are US-ASCII</H2>
-</BODY>
-</HTML>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
+<html lang=en-US xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
+<head profile=http://www.w3.org/2000/08/w3c-synd/#>
+<title>World Wide Web Consortium - Web Standards</title>
+<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
+</head>
+<body>
+<h1><img height=48 alt="The World Wide Web Consortium (W3C)" src="" width=315></h1>
+<h2>The encoding of the contents are US-ASCII</h2>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/UTF-8.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/UTF-8.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/UTF-8.html Wed Apr 21 18:26:15 2010
@@ -1,12 +1,12 @@
-<HTML>
- <HEAD>
- <TITLE> UTF-8 </TITLE>
+<html>
+ <head>
+ <title> UTF-8 </title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
楹﹁拏鐨勫ぉ璧嬫瀬楂橈紝鍗充娇鏄憲鍚嶇殑鈥滈害榛戔€濆紬鍏�甯冩灄宸撮噷涔熺洿鐜囩殑琛ㄧず锛岄害钂傜殑澶╄祴瓒冲彲浠ユ帓杩汵BA鐨勫墠10浣嶃€備絾鏄湪楹﹁拏鐨勮亴涓氱敓娑腑锛屼粬鍗翠粠鏈彇寰楁瘮瀛e悗璧涚涓€杞洿濂界殑鎴愮哗锛岀幇鍦ㄨ繕鐢氳嚦琚箍澶х殑鐞冭糠鍜屼笓瀹跺彛璇涚瑪浼愮О涓衡€滄瘨鐦も€濓紝绉颁粬涓嶅湪鍦轰笂鐨勬椂鍊欑伀绠弽鑰岃兘澶熸墦寰楁洿濂解€斺€斾綔涓轰竴涓勾钖�0涓囪秴绾х悆鏄熸潵璇达紝楹﹁拏浼间箮宸茬粡澶卞幓浜嗕粬鐨勫ぉ璧嬫墍搴旇缁欎粬鍜岀悆闃熷甫鏉ョ殑鍦轰笂浠峰€笺€�
鈥滈害钂備竴鐩磋涓猴紝浠栫殑澶╄祴鍙互璁╀粬鍋氬埌涓€浜涗簨鎯呫€傗€濆湪涓庡嚡灏旂壒浜虹殑姣旇禌涔嬪悗锛岄樋娉版柉鐗瑰鏄銆傗€滀絾鏄垜浠湁鏃跺€欎細蹇樿锛屽叾瀹炲姫鍔涙瘮澶╄祴鏇撮噸瑕侊紝鎴戜滑蹇呴』鍔姏鎵嶈銆傗€�- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/gb18030.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/gb18030.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/gb18030.html Wed Apr 21 18:26:15 2010
@@ -1,15 +1,15 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
- <HEAD>
- <TITLE> New Document </TITLE>
- <META NAME="Generator" CONTENT="EditPlus">
- <META NAME="Author" CONTENT="">
- <META NAME="Keywords" CONTENT="">
- <META NAME="Description" CONTENT="">
+<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.0 Transitional//EN">
+<html>
+ <head>
+ <title> New Document </title>
+ <meta NAME="Generator" CONTENT="EditPlus">
+ <meta NAME="Author" CONTENT="">
+ <meta NAME="Keywords" CONTENT="">
+ <meta NAME="Description" CONTENT="">
<meta http-equiv="Content-Type" content="text/html; charset=gb18030" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
NBA官方今日公布了09年全明星赛票选活动的阶段性结果,奥兰多魔术的中锋霍华德以2,102,368票仍然领跑东西部,但凭借本赛季表现出来的领袖本色,小皇帝詹姆斯获得认可,目前总计1,940,162票超越了科比居联盟第二。西部方面,小飞侠依旧无可争议的吸票机器,以1,903,798票稳居首位,而姚明则获得1,758,499票,首发中锋应属囊中之物。备受关注的我国球员易建联在此次公布的结果当中排名东部前锋第三位,与第二位的加内特仍然保持16万票的差距,考虑到绿衫军最近让人大跌眼镜的战绩以及阿联的爆发趋势,后者在最后10天的在线投票活动当中仍有希望迎头赶上。
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/iso-8859-1.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/iso-8859-1.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/iso-8859-1.html Wed Apr 21 18:26:15 2010
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
-<HTML lang=en-US xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
-<HEAD profile=http://www.w3.org/2000/08/w3c-synd/#>
-<TITLE>World Wide Web Consortium - Web Standards</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY>
-<H1 id=logo><IMG height=48 alt="The World Wide Web Consortium (W3C)" src="/Icons/w3c_main" width=315></H1>
-<H2 id=slogan>Leading the Web to Its Full Potential...</H2>
-</BODY>
-</HTML>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
+<html lang=en-US xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
+<head profile=http://www.w3.org/2000/08/w3c-synd/#>
+<title>World Wide Web Consortium - Web Standards</title>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+</head>
+<body>
+<h1 id=logo><img height=48 alt="The World Wide Web Consortium (W3C)" src="/Icons/w3c_main" width=315></h1>
+<h2 id=slogan>Leading the Web to Its Full Potential...</h2>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/macintosh.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/macintosh.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/macintosh.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> macintosh </TITLE>
+<html>
+ <head>
+ <title> macintosh </title>
<meta http-equiv="Content-Type" content="text/html; charset=macintosh" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
By Tom Curry Here is a guide to the process by which Gov. Rod Blagojevich of Illinois might be removed from office Impeachment is the formal accusation of wrongdoing, lobbed by a legislative body against an executive branch official, such as a governor ...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1250.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1250.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1250.html Wed Apr 21 18:26:15 2010
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
<title>windows-1250</title>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1251.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1251.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1251.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1251 </TITLE>
+<html>
+ <head>
+ <title> windows-1251 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1251" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
涛咽吕, 9 �礅 - 腥�皖忸耱� 袜溴驿�磬 疣琊屮屙桢 ��蝽桷�牮桤桉��蝠囗玷蝾�痤耨栝耜钽�汔玎 �赔痤矬 麇疱�蝈痧栩铕棹 雨疣桧�镱赅 礤 铒疣怃嚯桉� 弱 镱�怆屙棹 耧铖钺耱忸忄豚 桧纛痨圉� �耦汶囫梃 箨疣桧耜铋 耱铕铐�磬 耦玟囗桢 戾驿箜囵钿眍�祛龛蝾痂磴钼铋 耧屦蝽铋 觐扈耨梃 �篦囫蜩屐 镳邃耱噔栩咫彘 "绵顼痤爨", 钿磬觐 忮麇痤�耱嚯�桤忮耱眍, 黩�疏邂 镱-镳彐礤祗 耱噔栩 蜞觐�纛痨囹 戾踵龛珈�觐眚痤� 玎 蝠囗玷蝾�镱�耦祉屙桢. 蓄耨� 泐蝾忄 忸珙犴钼栩�恹眢驿屙眍 镳屦忄眄 溻�漤� 磬玎�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1252.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1252.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1252.html Wed Apr 21 18:26:15 2010
@@ -1,14 +1,14 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1252 </TITLE>
+<html>
+ <head>
+ <title> windows-1252 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
The article of impeachment -- essentially an indictment -- now goes to the state Senate for a trial. A two-thirds vote is required there to convict Blagojevich and remove him from office. The trial will be presided over by the chief justice of the Illinois Supreme Court and could begin as early as Jan. 26.

In the state Senate trial, impeachment managers and Blagojevich will have the opportunity to present witnesses and evidence.

If convicted by the Illinois Senate, Blagojevich would be removed from office and Lt. Gov. Pat Quinn would become acting governor.
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1253.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1253.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1253.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1253 </TITLE>
+<html>
+ <head>
+ <title> windows-1253 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1253" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
体 镬殡哚 翮�篝�贻眙耧 痫腚狃膻�黢摅妁�麸�霓祜�嗅脶燔 梳皲唪筢�镫镪朕聩箦 翮�溟揿羼�疱耖镤暹�翮�篝珥 梳皲唪筢 �沐黹贽 泷犰灬糨狎 麸�适�� 岭蓐�嗅疳褶汜. �� 嗅疳褶汜 贶脲箦 麸躜 徙顸翦�磲 蹰镨弭摅秕�糸�栎箦轵 麸�适�汩�麸 徙耧糸挈, ...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1254.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1254.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1254.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1254 </TITLE>
+<html>
+ <head>
+ <title> windows-1254 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1254" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
Arama yap齦an en 鏰rp齝�adres, AK Parti Genel Merkezi'nin kars齨da yer alan ve Atat黵k Orman 莍ftli餴'nin s齨齬lar�i鏸nde yer alan Sakl齜ah鏴 mesirelik alan� Polis ekipleri arama 鏰lmalar齨�Sakl齜ah鏴'nin '鏴eba' mevkiinde yo饀nla⺶齬齦d� ...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1255.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1255.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1255.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1255 </TITLE>
+<html>
+ <head>
+ <title> windows-1255 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1255" />
- </HEAD>
+ </head>

<body dir="rtl">
犷麽殪 扉狷 澉衢痂 痄 徜珈楮 铄蝣�溽殍珏�祺�熹赳鼹 帙 铋殂辁, 铖铒 "�帔 蝾泮� "囿 忮 玳鲥痖 爨 轺狎 帔 骐妃疱 熹怙 蜢 噫轲� 鲣"�轭�後轹弪 漕铄�彖戾 蜢殄". 噱祛 溴耖�遴铠 腴 溟 溽鬻�铗驿 "铄腴�珈楮 溧��爨 彘���帏忮痖 滂� 犷麽殪 扉狷 澉衢痂 漕汩痖-衢桤屦�殚铤 蜢 �溏扈�铄蝣�溽殍珏� 溧��潇殪��扉囔 熹赳轺 帔 潇玳钿 狲鲥蝥 蜴��囝�狯澍殚�(�) �漕铢熹, 噤邈 噱祛, 腴 "钹�孱蝈祉 钽轲�轾�爨 漶腴钿 屙 忮 玳鲥痖 轺狎 帔 骐妃�...
</body>
-</HTML>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1256.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1256.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1256.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1256 </TITLE>
+<html>
+ <head>
+ <title> windows-1256 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1256" />
- </HEAD>
+ </head>

- <BODY dir="RTL">
+ <body dir="RTL">
泌徜�呤瞧�轻藻硐 谝 轻享�轻抻倾 轻醒勤 轻谟哐�嵬堰�/豌怯/ 阡 奘�算卿砩 沅 啼嫦 轻峭梳轻 轻庞亚祈犴 阌橇 轻礞�轻蹄谏 蓓 峭�轻沅且�热嵯�软�崆屙�糟轻 挢勤 垡�. 孓轻�轻呤瞧�蓓 软卿 嗜涫 蓓�轻逄驺 " 卿�孑�阢犴�吻剌�驿孚砩�抒咪�呤瞧�轻藻硐 谝 轻享�轻抻倾 蓓 轻忧谏 16:20 沅 寝释倾 沅裔 硗梳�轻啼嫦 轻庞亚祈犴礓 蓓 晚 轻俞秦礓 蓓 软�崆屙�糟轻 垩�挢勤 垡�" . 媲智�轻软卿 " 娩 捩�吻丈 沅 呤瞧�轻抻倾 寝释闶 轻沅裔 盟淝�舒翘�谙�沅 轻啼嫦 孓�锰逡 轻闾清湘�卺�轻捩�仍哚 咔汜�媲崾�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1257.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1257.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1257.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1257 </TITLE>
+<html>
+ <head>
+ <title> windows-1257 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1257" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
! " # $ % & ' ( ) * + , - . /
0 1 2 3 4 5 6 7 8 9 : ; < = > ?
@ A B C D E F G H I J K L M N O
@@ -19,5 +19,5 @@
���������������� ���������������� ����������������
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1258.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1258.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-1258.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1258 </TITLE>
+<html>
+ <head>
+ <title> windows-1258 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1258" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
L�nh?ng ng�i h?c tr?, m髇 qu�d鈔g t?ng th?y c�trong ng鄖 20/11 kh鬾g ph?i l�nh?ng b�hoa hay nh?ng t?ng v?t v? v?t ch?t m�ch韓h l�s? th鄋h �t c?a h?c tr?. Nh?ng b鬾g hoa ti c�th? t?a hng th鮩 ng醫 nh齨g n�kh鬾g th鮩 b?ng hoa 餴?m m�i. Kh鬾g c�l?i ca n鄌 hay b?ng s? th鄋h c鬾g m�ng�i h?c tr? k韓h d鈔g l阯 th?y. 畜 m?i l�餴?u nh?ng ng�i l鄊 ngh? ?ch? �? m?i c?m th?y h?nh ph鷆. Th?y � 瘕a em �n b?n b? tri th?c m?i. Th鄋h c鬾g c?a em h鬽 nay lu鬾 c�b髇g d醤g th?y. Th鄋h c鬾g h鬽 c?a ch鷑g em ch韓h l�th�c 餺 v? s? th鄋h �t c?a ng�i th?y.
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-874.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-874.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-874.html Wed Apr 21 18:26:15 2010
@@ -1,11 +1,11 @@
-<HTML>
- <HEAD>
- <TITLE> windows-874 </TITLE>
+<html>
+ <head>
+ <title> windows-874 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-874" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
嗷绻荣孤烀橇崴盆�垦о九�嗑阻褪写恰视嗣押∫盲楣艘
峁扦源 :: 愎幻朽啡琳嗲绾 "垦о九�垦о九凸渑轨" 吐勹烈×衣 酚淞嗝忆凌们玲伺瑙 垦о九�淝殂拱夜㈤土倥∨咬(獯路印颐脱距捶坟∏压) 嗑阻豌碎ц衣佃汀颐ら顾�崤朽咀柰闼榧匍悛橥怨嗟兔爨圭凳伊颐多㈤叶支㈤土倥氛桡肆�费故裂�吐枰谴嗝缜 崤惺写恰
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-949.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-949.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/alias_mapping/windows-949.html Wed Apr 21 18:26:15 2010
@@ -1,14 +1,14 @@
-<HTML>
- <HEAD>
- <TITLE> windows-949 </TITLE>
+<html>
+ <head>
+ <title> windows-949 </title>
<meta http-equiv="Content-Type" content="text/html; charset=windows-949" />
- </HEAD>
+ </head>

- <BODY>
+ <body>
茄唱扼寸篮 2岿 烙矫惫雀俊辑 惫雀 郴 气仿青荤 规瘤甫 困茄 '惫雀 气仿规瘤过' 力沥档 眠柳窍扁肺 沁促.

刮林寸篮 弊矾唱 "茄唱扼寸捞 塞阑 菊技况 'MB厩过'阑 碍青 贸府窍妨绊 秦辑 必茄 措摹 惑怕啊 惯窜等 巴篮 芭沸窍瘤 臼篮 盲 具寸捞 气仿沥寸牢 剧 惫刮阑 龋档窍绊 乐促"哥 馆惯沁促.

烙盲柳 八蔓醚厘篮 捞朝 "惫雀 气仿荤怕客 包访等 绊家·绊惯 荤扒 11扒阑 脚加窍绊 傍沥窍霸 枚历洒 荐荤窍扼"绊 瘤矫沁促. 烙 醚厘篮 "惫雀 磊啦鼻篮 弥措茄 粮吝蹬具 窍瘤父, 绊家·绊惯捞 乐绰 父怒 家加 沥寸捞唱 瘤困 绊窍甫 阜沸窍绊 过苞 盔蘑俊 蝶扼 贸府窍扼"绊 富沁促. 茄祈 版蔓篮 碍扁癌 刮畴寸 措钎俊霸 12老, 刮林寸 巩切柳, 刮畴寸 捞沥锐 狼盔俊霸绰 13老 版蔓俊 免籍窍扼绰 傍巩阑 阿阿 惯价沁促.
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> Big5 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> Big5 </title>
+ </head>

- <BODY>
+ <body>
┮琎ぱ┾琩玡羆参朝┬まㄓ眏疨ぃ骸┮よノ瞒穦癸陆絚耫胔好琌ㄓ贝留╬硓筁畍┮笷腨タк某

┮琎ぱミ坚睲琩┬琌ㄒ︽そㄆゼ朝┬ずΤ┮孔陆絚耫┾琩挡狦ゼ祇瞷笻砏珇ゼ盿ǐヴゅン┬ずΤ菏跌竟魁紇ち常Τ魁琩
@@ -11,6 +11,6 @@
┮捌┮λ眏秸蝴臔Μ甧–ぱ常穦ぃ﹚ぃ﹚翴┾琩┬琎ぱと┾琩朝玡羆参┬朝タ籔ミ〆襖眶疭钡ǎ钡帝皑琌畍穦ǎㄓぃの朝┾琩ㄆ

畍綠ゅ纒玥弧朝к某琩┬獻デ留╬踞みк臛ゅ穦胣┪ア萝琎ぱぃ幢рюň戈ユ倒磷ず甧胣某ら畑拦竛笷↖纐к某ボ穦σ納
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-5_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-5_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-5_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-5 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> ISO-8859-5 </title>
+ </head>

- <BODY>
+ <body>
季梁舶, 9 镙�- 栏�睫肄徕� 叫哉衷�菪 嘈奏砧蛰卣 �唢廨劓�卩刈蒯��忄休棕廪�噢後刭嶷抻�有仔 �狄噢咩 缯嗾�庹噜剽捺仡 泌嘈剌�咿谛 菡 捱嘈以雄蒯� 稿 咿镆壅葚�徇掎扪徕肄倚坌 剌滢嘬墟仫 �徂盂嗅刎 阙嘈剌嶷拶 徕捺掭�菪 徂自休卣 苷衷爿朽拊蒉�苻葚廪嘭萦抟拶 碲徇锗廨拶 谵茇後刎 �沌嗅庳哲 哙赵徕幸剽折召 "承走噢苄", 拊菪谵 艺缯噢�徕雄�刈艺徕蒉, 玮�贺找 咿-哙罩菡茔 徕幸剽 庑谵�滢嘬锈 苷逍葚总�谵葩噢埏 仔 忄休棕廪�咿�徂茌蛰卣. 擂後仫 愚廪倚 肄邹演抟剽�译葶衷蛰蒉 哙锗倚葺胝 砸�暂�菪仔�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-6_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-6_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-6_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-6 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> ISO-8859-6 </title>
+ </head>

- <BODY dir="RTL">
+ <body dir="RTL">
觅滏�闶瞧�卿早晗 僖 卿详�卿庥清 卿醒琴 卿儆阊�渫雁�/湾怯/ 冁 馐�隋擎晟 彐 替柘 卿峭输卿 卿庞亚脐潢 逵橇 卿觇�卿体偕 彡 峭�卿彐且�热湎�汝�淝珀�藻卿 庾琴 谝�. 桠卿�卿闶瞧�彡 汝擎 嗜媸 彡�卿缣桢 " 擎�栳�馘潢�吻揍�桄栀晟�叔沔�闶瞧�卿早晗 僖 卿详�卿庥清 彡 卿忧偕 16:20 彐 氢释清 彐忆 晖输�卿替柘 卿庞亚脐潢赕 彡 完 卿愉亲赕 彡 汝�淝珀�藻卿 谘�庾琴 谝�" . 枨智�卿汝擎 " 面 忤�吻丈 彐 闶瞧�卿庥清 氢释迨 卿彐忆 盟媲�疏翘�傧�彐 卿替柘 桠�锰缫 卿逄晴翔�黉�卿忤�仍沅 闱邃�枨涫�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-7_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-7_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-7_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-7 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> ISO-8859-7 </title>
+ </head>

- <BODY>
+ <body>
体 镬殡哚 翮�篝�贻眙耧 痫腚狃膻�黢摅妁�麸�霓祜�嗅脶燔 梳皲唪筢�镫镪朕聩箦 翮�溟揿羼�疱耖镤暹�翮�篝珥 梳皲唪筢 �沐黹贽 泷犰灬糨狎 麸�适�� 岭蓐�嗅疳褶汜. �� 嗅疳褶汜 贶脲箦 麸躜 徙顸翦�磲 蹰镨弭摅秕�糸�栎箦轵 麸�适�汩�麸 徙耧糸挈, ...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-8_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-8_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/ISO-8859-8_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> ISO-8859-8 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> ISO-8859-8 </title>
+ </head>

<body dir="rtl">
犷麽殪 扉狷 澉衢痂 痄 徜珈楮 铄蝣�溽殍珏�祺�熹赳鼹 帙 铋殂辁, 铖铒 "�帔 蝾泮� "囿 忮 玳鲥痖 爨 轺狎 帔 骐妃疱 熹怙 蜢 噫轲� 鲣"�轭�後轹弪 漕铄�彖戾 蜢殄". 噱祛 溴耖�遴铠 腴 溟 溽鬻�铗驿 "铄腴�珈楮 溧��爨 彘���帏忮痖 滂� 犷麽殪 扉狷 澉衢痂 漕汩痖-衢桤屦�殚铤 蜢 �溏扈�铄蝣�溽殍珏� 溧��潇殪��扉囔 熹赳轺 帔 潇玳钿 狲鲥蝥 蜴�- 囝�狯澍殚�(�) �漕铢熹, 噤邈 噱祛, 腴 "钹�孱蝈祉 钽轲�轾�爨 漶腴钿 屙 忮 玳鲥痖 轺狎 帔 骐妃�...
</body>
-</HTML>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/KOI8-R_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/KOI8-R_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/KOI8-R_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> KOI8-R </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> KOI8-R </title>
+ </head>

- <BODY>
+ <body>
盹箅麽, 9 盐�- 蜷�钕紫釉� 盍呐帜�瘟 伊谝袍盼膳 �醒晕擅�艘哨捎��砸廖谏韵�蚁佑墒铀锨�橇诹 �遄蚁姓 夼遗�耘乙稍弦衫 跛伊晌�邢肆 闻 闲伊啄撂捎� 槿 邢炎膛紊�有嫌下釉紫琢塘 晌葡彝撩裳 �酉翘劣缮 账伊晌铀鲜 釉弦衔�瘟 酉谀廖膳 团帜瘴烈夏蜗�拖紊韵疑吻献鲜 芩有乓晕鲜 讼蜕佑缮 �辙劣陨磐 幸拍釉磷稍盘攀 "缌谛蚁土", 夏瘟讼 着夼蚁�釉撂�哨着釉蜗, 拊�肷抛 邢-幸胖闻驼 釉磷稍 粤讼�葡彝猎 团攘紊谕�讼卧蚁萄 诹 砸廖谏韵�邢�酉臀盼膳. 蛳佑裳 窍韵琢 紫谙挛献稍�踪握帜盼蜗 幸乓琢挝倥 淖�奈�瘟诹�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/Shift-JIS_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/Shift-JIS_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/Shift-JIS_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,11 +1,11 @@
-<HTML>
- <HEAD>
- <TITLE> Shift_JIS </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> Shift_JIS </title>
+ </head>

- <BODY>
+ <body>
廜堾媍堾塣塩埾堳夛偼俋擔屵屻偺棟帠夛偱丄侾俁擔偵杮夛媍傪奐偒丄俀挍墌偺掕妟媼晅嬥傪惙傝崬傫偩俀侽侽俉擭搙戞俀師曗惓梊嶼埬偲娭楢朄埬傪嵦寛偡傞偙偲傪彫嶁寷師埾堳挿偺怑尃偱寛傔偨丅梌搣偺巀惉懡悢偱壜寛丄嶲堾偵憲晅偝傟傞丅柉庡搣偼乽媼晅嬥偺媍榑偑晄廫暘乿偲斀敪丄嶲堾怰媍偵偼摉柺墳偠側偄曽恓丅嵦寛偱偼丄媼晅嬥傊偺晄枮偑偔偡傇傞帺柉搣撪偐傜憿斀幰偑弌傞壜擻惈傕偁傝丄崱崙夛偼嵟弶偺儎儅応傪寎偊傞丅
丂廜堾媍塣埾偵愭棫偪丄廜堾梊嶼埾堳夛偼棟帠夛偱丄侾俁擔偵俀師曗惓偺掲傔偔偔傝幙媈傪峴偄嵦寛偡傞偙偲傪寛傔偨丅嵿柋嬥梈丄憤柋丄崙搚岎捠偺奺埾堳夛傕棟帠夛側偳傪奐偒丄掕妟媼晅嬥側偳偺嵿尮偲偟偰嵿惌搳梈帒摿暿夛寁偐傜係挍墌傪堦斒夛寁偵孞傝擖傟傞摿椺朄埬側偳偺娭楢朄埬傪丄摨擔拞偵嵦寛偡傞偙偲傪寛掕丅偄偢傟傕杮夛媍偵嬞媫忋掱偝傟丄壜寛偝傟傞塣傃偩丅
丂偙傟偵懳偟丄柉庡搣偼俋擔屵屻丄搣杮晹偱彫戲堦榊戙昞傜偑弌惾偟偰姴晹夛傪奐偒丄俀師曗惓傊偺懳墳偵偮偄偰(1)侾俁擔偺廜堾梊嶼埾偲杮夛媍偵偼弌惾偟丄嵦寛捈慜偵戅惾側偳偟偰峈媍偡傞(2)嶲堾偱偺怰媍偼摉柺嫅斲偡傞亅偙偲傪寛傔偨丅
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/UTF-8_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/UTF-8_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/UTF-8_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML><HEAD>
- <TITLE> UTF-8 </TITLE>
- </HEAD><BODY>
+<html><head>
+ <title> UTF-8 </title>
+ </head><body>
楹﹁拏鐨勫ぉ璧嬫瀬楂橈紝鍗充娇鏄憲鍚嶇殑鈥滈害榛戔€濆紬鍏�甯冩灄宸撮噷涔熺洿鐜囩殑琛ㄧず锛岄害钂傜殑澶╄祴瓒冲彲浠ユ帓杩汵BA鐨勫墠10浣嶃€備絾鏄湪楹﹁拏鐨勮亴涓氱敓娑腑锛屼粬鍗翠粠鏈彇寰楁瘮瀛e悗璧涚涓€杞洿濂界殑鎴愮哗锛岀幇鍦ㄨ繕鐢氳嚦琚箍澶х殑鐞冭糠鍜屼笓瀹跺彛璇涚瑪浼愮О涓衡€滄瘨鐦も€濓紝绉颁粬涓嶅湪鍦轰笂鐨勬椂鍊欑伀绠弽鑰岃兘澶熸墦寰楁洿濂解€斺€斾綔涓轰竴涓勾钖�0涓囪秴绾х悆鏄熸潵璇达紝楹﹁拏浼间箮宸茬粡澶卞幓浜嗕粬鐨勫ぉ璧嬫墍搴旇缁欎粬鍜岀悆闃熷甫鏉ョ殑鍦轰笂浠峰€笺€�
鈥滈害钂備竴鐩磋涓猴紝浠栫殑澶╄祴鍙互璁╀粬鍋氬埌涓€浜涗簨鎯呫€傗€濆湪涓庡嚡灏旂壒浜虹殑姣旇禌涔嬪悗锛岄樋娉版柉鐗瑰鏄銆傗€滀絾鏄垜浠湁鏃跺€欎細蹇樿锛屽叾瀹炲姫鍔涙瘮澶╄祴鏇撮噸瑕侊紝鎴戜滑蹇呴』鍔姏鎵嶈銆傗€�

-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Big5_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Big5_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Big5_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,8 +1,8 @@

<!-- saved from url=(0080)http://mock.http/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=Big5">
- <TITLE> Big5 </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=Big5">
+ <title> Big5 </title>
+ </head><body>
┮琎ぱ┾琩玡羆参朝┬まㄓ眏疨ぃ骸┮よノ瞒穦癸陆絚耫胔好琌ㄓ贝留╬硓筁畍┮笷腨タк某

┮琎ぱミ坚睲琩┬琌ㄒ︽そㄆゼ朝┬ずΤ┮孔陆絚耫┾琩挡狦ゼ祇瞷笻砏珇ゼ盿ǐヴゅン┬ずΤ菏跌竟魁紇ち常Τ魁琩
@@ -13,4 +13,4 @@



-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-5_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-5_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-5_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0086)http://mock.http/encoding_tests/auto_detect/ISO-8859-5_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-5">
- <TITLE> ISO-8859-5 </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-5">
+ <title> ISO-8859-5 </title>
+ </head><body>
季梁舶, 9 镙�- 栏�睫肄徕� 叫哉衷�菪 嘈奏砧蛰卣 �唢廨劓�卩刈蒯��忄休棕廪�噢後刭嶷抻�有仔 �狄噢咩 缯嗾�庹噜剽捺仡 泌嘈剌�咿谛 菡 捱嘈以雄蒯� 稿 咿镆壅葚�徇掎扪徕肄倚坌 剌滢嘬墟仫 �徂盂嗅刎 阙嘈剌嶷拶 徕捺掭�菪 徂自休卣 苷衷爿朽拊蒉�苻葚廪嘭萦抟拶 碲徇锗廨拶 谵茇後刎 �沌嗅庳哲 哙赵徕幸剽折召 "承走噢苄", 拊菪谵 艺缯噢�徕雄�刈艺徕蒉, 玮�贺找 咿-哙罩菡茔 徕幸剽 庑谵�滢嘬锈 苷逍葚总�谵葩噢埏 仔 忄休棕廪�咿�徂茌蛰卣. 擂後仫 愚廪倚 肄邹演抟剽�译葶衷蛰蒉 哙锗倚葺胝 砸�暂�菪仔�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-6_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-6_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-6_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0086)http://mock.http/encoding_tests/auto_detect/ISO-8859-6_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
- <TITLE> ISO-8859-6 </TITLE>
- </HEAD><BODY dir="RTL">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
+ <title> ISO-8859-6 </title>
+ </head><body dir="RTL">
觅滏�闶瞧�卿早晗 僖 卿详�卿庥清 卿醒琴 卿儆阊�渫雁�/湾怯/ 冁 馐�隋擎晟 彐 替柘 卿峭输卿 卿庞亚脐潢 逵橇 卿觇�卿体偕 彡 峭�卿彐且�热湎�汝�淝珀�藻卿 庾琴 谝�. 桠卿�卿闶瞧�彡 汝擎 嗜媸 彡�卿缣桢 " 擎�栳�馘潢�吻揍�桄栀晟�叔沔�闶瞧�卿早晗 僖 卿详�卿庥清 彡 卿忧偕 16:20 彐 氢释清 彐忆 晖输�卿替柘 卿庞亚脐潢赕 彡 完 卿愉亲赕 彡 汝�淝珀�藻卿 谘�庾琴 谝�" . 枨智�卿汝擎 " 面 忤�吻丈 彐 闶瞧�卿庥清 氢释迨 卿彐忆 盟媲�疏翘�傧�彐 卿替柘 桠�锰缫 卿逄晴翔�黉�卿忤�仍沅 闱邃�枨涫�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-7_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-7_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-7_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0086)http://mock.http/encoding_tests/auto_detect/ISO-8859-7_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-7">
- <TITLE> ISO-8859-7 </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-7">
+ <title> ISO-8859-7 </title>
+ </head><body>
体 镬殡哚 翮�篝�贻眙耧 痫腚狃膻�黢摅妁�麸�霓祜�嗅脶燔 梳皲唪筢�镫镪朕聩箦 翮�溟揿羼�疱耖镤暹�翮�篝珥 梳皲唪筢 �沐黹贽 泷犰灬糨狎 麸�适�� 岭蓐�嗅疳褶汜. �� 嗅疳褶汜 贶脲箦 麸躜 徙顸翦�磲 蹰镨弭摅秕�糸�栎箦轵 麸�适�汩�麸 徙耧糸挈, ...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-8_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-8_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_ISO-8859-8_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0086)http://mock.http/encoding_tests/auto_detect/ISO-8859-8_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-8-I">
- <TITLE> ISO-8859-8 </TITLE>
- </HEAD><BODY dir="rtl">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-8-I">
+ <title> ISO-8859-8 </title>
+ </head><body dir="rtl">
犷麽殪 扉狷 澉衢痂 痄 徜珈楮 铄蝣�溽殍珏�祺�熹赳鼹 帙 铋殂辁, 铖铒 "�帔 蝾泮� "囿 忮 玳鲥痖 爨 轺狎 帔 骐妃疱 熹怙 蜢 噫轲� 鲣"�轭�後轹弪 漕铄�彖戾 蜢殄". 噱祛 溴耖�遴铠 腴 溟 溽鬻�铗驿 "铄腴�珈楮 溧��爨 彘���帏忮痖 滂� 犷麽殪 扉狷 澉衢痂 漕汩痖-衢桤屦�殚铤 蜢 �溏扈�铄蝣�溽殍珏� 溧��潇殪��扉囔 熹赳轺 帔 潇玳钿 狲鲥蝥 蜴�- 囝�狯澍殚�(�) �漕铢熹, 噤邈 噱祛, 腴 "钹�孱蝈祉 钽轲�轾�爨 漶腴钿 屙 忮 玳鲥痖 轺狎 帔 骐妃�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_KOI8-R_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_KOI8-R_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_KOI8-R_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0082)http://mock.http/encoding_tests/auto_detect/KOI8-R_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=KOI8-R">
- <TITLE> KOI8-R </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=KOI8-R">
+ <title> KOI8-R </title>
+ </head><body>
盹箅麽, 9 盐�- 蜷�钕紫釉� 盍呐帜�瘟 伊谝袍盼膳 �醒晕擅�艘哨捎��砸廖谏韵�蚁佑墒铀锨�橇诹 �遄蚁姓 夼遗�耘乙稍弦衫 跛伊晌�邢肆 闻 闲伊啄撂捎� 槿 邢炎膛紊�有嫌下釉紫琢塘 晌葡彝撩裳 �酉翘劣缮 账伊晌铀鲜 釉弦衔�瘟 酉谀廖膳 团帜瘴烈夏蜗�拖紊韵疑吻献鲜 芩有乓晕鲜 讼蜕佑缮 �辙劣陨磐 幸拍釉磷稍盘攀 "缌谛蚁土", 夏瘟讼 着夼蚁�釉撂�哨着釉蜗, 拊�肷抛 邢-幸胖闻驼 釉磷稍 粤讼�葡彝猎 团攘紊谕�讼卧蚁萄 诹 砸廖谏韵�邢�酉臀盼膳. 蛳佑裳 窍韵琢 紫谙挛献稍�踪握帜盼蜗 幸乓琢挝倥 淖�奈�瘟诹�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Shift-JIS_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Shift-JIS_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_Shift-JIS_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,11 +1,11 @@

<!-- saved from url=(0085)http://mock.http/encoding_tests/auto_detect/Shift-JIS_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
- <TITLE> Shift_JIS </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+ <title> Shift_JIS </title>
+ </head><body>
廜堾媍堾塣塩埾堳夛偼俋擔屵屻偺棟帠夛偱丄侾俁擔偵杮夛媍傪奐偒丄俀挍墌偺掕妟媼晅嬥傪惙傝崬傫偩俀侽侽俉擭搙戞俀師曗惓梊嶼埬偲娭楢朄埬傪嵦寛偡傞偙偲傪彫嶁寷師埾堳挿偺怑尃偱寛傔偨丅梌搣偺巀惉懡悢偱壜寛丄嶲堾偵憲晅偝傟傞丅柉庡搣偼乽媼晅嬥偺媍榑偑晄廫暘乿偲斀敪丄嶲堾怰媍偵偼摉柺墳偠側偄曽恓丅嵦寛偱偼丄媼晅嬥傊偺晄枮偑偔偡傇傞帺柉搣撪偐傜憿斀幰偑弌傞壜擻惈傕偁傝丄崱崙夛偼嵟弶偺儎儅応傪寎偊傞丅
丂廜堾媍塣埾偵愭棫偪丄廜堾梊嶼埾堳夛偼棟帠夛偱丄侾俁擔偵俀師曗惓偺掲傔偔偔傝幙媈傪峴偄嵦寛偡傞偙偲傪寛傔偨丅嵿柋嬥梈丄憤柋丄崙搚岎捠偺奺埾堳夛傕棟帠夛側偳傪奐偒丄掕妟媼晅嬥側偳偺嵿尮偲偟偰嵿惌搳梈帒摿暿夛寁偐傜係挍墌傪堦斒夛寁偵孞傝擖傟傞摿椺朄埬側偳偺娭楢朄埬傪丄摨擔拞偵嵦寛偡傞偙偲傪寛掕丅偄偢傟傕杮夛媍偵嬞媫忋掱偝傟丄壜寛偝傟傞塣傃偩丅
丂偙傟偵懳偟丄柉庡搣偼俋擔屵屻丄搣杮晹偱彫戲堦榊戙昞傜偑弌惾偟偰姴晹夛傪奐偒丄俀師曗惓傊偺懳墳偵偮偄偰(1)侾俁擔偺廜堾梊嶼埾偲杮夛媍偵偼弌惾偟丄嵦寛捈慜偵戅惾側偳偟偰峈媍偡傞(2)嶲堾偱偺怰媍偼摉柺嫅斲偡傞亅偙偲傪寛傔偨丅


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_UTF-8_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_UTF-8_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_UTF-8_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,11 +1,11 @@

<!-- saved from url=(0081)http://mock.http/encoding_tests/auto_detect/UTF-8_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <TITLE> UTF-8 </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title> UTF-8 </title>
+ </head><body>
楹﹁拏鐨勫ぉ璧嬫瀬楂橈紝鍗充娇鏄憲鍚嶇殑鈥滈害榛戔€濆紬鍏�甯冩灄宸撮噷涔熺洿鐜囩殑琛ㄧず锛岄害钂傜殑澶╄祴瓒冲彲浠ユ帓杩汵BA鐨勫墠10浣嶃€備絾鏄湪楹﹁拏鐨勮亴涓氱敓娑腑锛屼粬鍗翠粠鏈彇寰楁瘮瀛e悗璧涚涓€杞洿濂界殑鎴愮哗锛岀幇鍦ㄨ繕鐢氳嚦琚箍澶х殑鐞冭糠鍜屼笓瀹跺彛璇涚瑪浼愮О涓衡€滄瘨鐦も€濓紝绉颁粬涓嶅湪鍦轰笂鐨勬椂鍊欑伀绠弽鑰岃兘澶熸墦寰楁洿濂解€斺€斾綔涓轰竴涓勾钖�0涓囪秴绾х悆鏄熸潵璇达紝楹﹁拏浼间箮宸茬粡澶卞幓浜嗕粬鐨勫ぉ璧嬫墍搴旇缁欎粬鍜岀悆闃熷甫鏉ョ殑鍦轰笂浠峰€笺€�
鈥滈害钂備竴鐩磋涓猴紝浠栫殑澶╄祴鍙互璁╀粬鍋氬埌涓€浜涗簨鎯呫€傗€濆湪涓庡嚡灏旂壒浜虹殑姣旇禌涔嬪悗锛岄樋娉版柉鐗瑰鏄銆傗€滀絾鏄垜浠湁鏃跺€欎細蹇樿锛屽叾瀹炲姫鍔涙瘮澶╄祴鏇撮噸瑕侊紝鎴戜滑蹇呴』鍔姏鎵嶈銆傗€�

-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_gb18030_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!-- saved from url=(0083)http://mock.http/encoding_tests/auto_detect/gb18030_with_no_encoding_specified.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=gb18030">
-<TITLE>中国制造的领军者3名</TITLE>
-</HEAD><BODY>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=gb18030">
+<title>中国制造的领军者3名</title>
+</head><body>
中国制造的领军者3名;

马兴瑞,中国航天科技集团公司总经理,用令世界震惊的航天“中国速度”,马兴瑞推动中国航天进入太空行走时代;
@@ -16,4 +16,4 @@
万捷,雅昌企业集团有限公司董事长,他创造性将传统印刷业与现代IT技术完美融合,在毕升发明印刷术900多年后,他为印刷术的故乡重新赢得了骄傲和尊严;

韩三平,中国电影集团公司董事长,从《无极》、《投名状》到《赤壁》、《梅兰芳》,由韩三平领导的中影团队使中国电影开始进入成熟的大片时代;
-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_iso-8859-1_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_iso-8859-1_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_iso-8859-1_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
<!-- saved from url=(0086)http://mock.http/encoding_tests/auto_detect/iso-8859-1_with_no_encoding_specified.html -->
-<HTML lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml"><HEAD profile="http://www.w3.org/2000/08/w3c-synd/#"><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<TITLE>iso-8859-1</TITLE>
-</HEAD><BODY>
-<H1 id="logo"><IMG height="48" alt="The World Wide Web Consortium (W3C)" src="http://mock.http/Icons/w3c_main" width="315"></H1>
-<H2 id="slogan">Leading the Web to Its Full Potential...</H2>
+<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml"><head profile="http://www.w3.org/2000/08/w3c-synd/#"><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>iso-8859-1</title>
+</head><body>
+<h1 id="logo"><img height="48" alt="The World Wide Web Consortium (W3C)" src="http://mock.http/Icons/w3c_main" width="315"></h1>
+<h2 id="slogan">Leading the Web to Its Full Potential...</h2>

-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1251_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1251_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1251_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0088)http://mock.http/encoding_tests/auto_detect/windows-1251_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=windows-1251">
- <TITLE> windows-1251 </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1251">
+ <title> windows-1251 </title>
+ </head><body>
涛咽吕, 9 �礅 - 腥�皖忸耱� 袜溴驿�磬 疣琊屮屙桢 ��蝽桷�牮桤桉��蝠囗玷蝾�痤耨栝耜钽�汔玎 �赔痤矬 麇疱�蝈痧栩铕棹 雨疣桧�镱赅 礤 铒疣怃嚯桉� 弱 镱�怆屙棹 耧铖钺耱忸忄豚 桧纛痨圉� �耦汶囫梃 箨疣桧耜铋 耱铕铐�磬 耦玟囗桢 戾驿箜囵钿眍�祛龛蝾痂磴钼铋 耧屦蝽铋 觐扈耨梃 �篦囫蜩屐 镳邃耱噔栩咫彘 "绵顼痤爨", 钿磬觐 忮麇痤�耱嚯�桤忮耱眍, 黩�疏邂 镱-镳彐礤祗 耱噔栩 蜞觐�纛痨囹 戾踵龛珈�觐眚痤� 玎 蝠囗玷蝾�镱�耦祉屙桢. 蓄耨� 泐蝾忄 忸珙犴钼栩�恹眢驿屙眍 镳屦忄眄 溻�漤� 磬玎�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1254_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1254_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1254_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0088)http://mock.http/encoding_tests/auto_detect/windows-1254_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=windows-1254">
- <TITLE> windows-1254 </TITLE>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1254">
+ <title> windows-1254 </title>
+ </head><body>
Arama yap齦an en 鏰rp齝�adres, AK Parti Genel Merkezi'nin kars齨da yer alan ve Atat黵k Orman 莍ftli餴'nin s齨齬lar�i鏸nde yer alan Sakl齜ah鏴 mesirelik alan� Polis ekipleri arama 鏰lmalar齨�Sakl齜ah鏴'nin '鏴eba' mevkiinde yo饀nla⺶齬齦d� ...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1255_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1255_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1255_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0088)http://mock.http/encoding_tests/auto_detect/windows-1255_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=windows-1255">
- <TITLE> windows-1255 </TITLE>
- </HEAD><BODY dir="rtl">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1255">
+ <title> windows-1255 </title>
+ </head><body dir="rtl">
犷麽殪 扉狷 澉衢痂 痄 徜珈楮 铄蝣�溽殍珏�祺�熹赳鼹 帙 铋殂辁, 铖铒 "�帔 蝾泮� "囿 忮 玳鲥痖 爨 轺狎 帔 骐妃疱 熹怙 蜢 噫轲� 鲣"�轭�後轹弪 漕铄�彖戾 蜢殄". 噱祛 溴耖�遴铠 腴 溟 溽鬻�铗驿 "铄腴�珈楮 溧��爨 彘���帏忮痖 滂� 犷麽殪 扉狷 澉衢痂 漕汩痖-衢桤屦�殚铤 蜢 �溏扈�铄蝣�溽殍珏� 溧��潇殪��扉囔 熹赳轺 帔 潇玳钿 狲鲥蝥 蜴��囝�狯澍殚�(�) �漕铢熹, 噤邈 噱祛, 腴 "钹�孱蝈祉 钽轲�轾�爨 漶腴钿 屙 忮 玳鲥痖 轺狎 帔 骐妃�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1256_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1256_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-1256_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@

<!-- saved from url=(0088)http://mock.http/encoding_tests/auto_detect/windows-1256_with_no_encoding_specified.html -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=windows-1256">
- <TITLE> windows-1256 </TITLE>
- </HEAD><BODY dir="RTL">
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1256">
+ <title> windows-1256 </title>
+ </head><body dir="RTL">
泌徜�呤瞧�轻藻硐 谝 轻享�轻抻倾 轻醒勤 轻谟哐�嵬堰�/豌怯/ 阡 奘�算卿砩 沅 啼嫦 轻峭梳轻 轻庞亚祈犴 阌橇 轻礞�轻蹄谏 蓓 峭�轻沅且�热嵯�软�崆屙�糟轻 挢勤 垡�. 孓轻�轻呤瞧�蓓 软卿 嗜涫 蓓�轻逄驺 " 卿�孑�阢犴�吻剌�驿孚砩�抒咪�呤瞧�轻藻硐 谝 轻享�轻抻倾 蓓 轻忧谏 16:20 沅 寝释倾 沅裔 硗梳�轻啼嫦 轻庞亚祈犴礓 蓓 晚 轻俞秦礓 蓓 软�崆屙�糟轻 垩�挢勤 垡�" . 媲智�轻软卿 " 娩 捩�吻丈 沅 呤瞧�轻抻倾 寝释闶 轻沅裔 盟淝�舒翘�谙�沅 轻啼嫦 孓�锰逡 轻闾清湘�卺�轻捩�仍哚 咔汜�媲崾�...


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,8 +1,8 @@

<!-- 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>
- </HEAD><BODY>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-949">
+ <title> windows-949 </title>
+ </head><body>
茄唱扼寸篮 2岿 烙矫惫雀俊辑 惫雀 郴 气仿青荤 规瘤甫 困茄 '惫雀 气仿规瘤过' 力沥档 眠柳窍扁肺 沁促.

刮林寸篮 弊矾唱 "茄唱扼寸捞 塞阑 菊技况 'MB厩过'阑 碍青 贸府窍妨绊 秦辑 必茄 措摹 惑怕啊 惯窜等 巴篮 芭沸窍瘤 臼篮 盲 具寸捞 气仿沥寸牢 剧 惫刮阑 龋档窍绊 乐促"哥 馆惯沁促.
@@ -10,4 +10,4 @@
烙盲柳 八蔓醚厘篮 捞朝 "惫雀 气仿荤怕客 包访等 绊家·绊惯 荤扒 11扒阑 脚加窍绊 傍沥窍霸 枚历洒 荐荤窍扼"绊 瘤矫沁促. 烙 醚厘篮 "惫雀 磊啦鼻篮 弥措茄 粮吝蹬具 窍瘤父, 绊家·绊惯捞 乐绰 父怒 家加 沥寸捞唱 瘤困 绊窍甫 阜沸窍绊 过苞 盔蘑俊 蝶扼 贸府窍扼"绊 富沁促. 茄祈 版蔓篮 碍扁癌 刮畴寸 措钎俊霸 12老, 刮林寸 巩切柳, 刮畴寸 捞沥锐 狼盔俊霸绰 13老 版蔓俊 免籍窍扼绰 傍巩阑 阿阿 惯价沁促.


-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/gb18030_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/gb18030_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/gb18030_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!-- saved from url=(0023)http://www.sina.com.cn/ -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD>
-<TITLE>中国制造的领军者3名</TITLE>
-</HEAD>
-<BODY>
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<title>中国制造的领军者3名</title>
+</head>
+<body>
中国制造的领军者3名;

马兴瑞,中国航天科技集团公司总经理,用令世界震惊的航天“中国速度”,马兴瑞推动中国航天进入太空行走时代;
@@ -17,4 +17,4 @@
万捷,雅昌企业集团有限公司董事长,他创造性将传统印刷业与现代IT技术完美融合,在毕升发明印刷术900多年后,他为印刷术的故乡重新赢得了骄傲和尊严;

韩三平,中国电影集团公司董事长,从《无极》、《投名状》到《赤壁》、《梅兰芳》,由韩三平领导的中影团队使中国电影开始进入成熟的大片时代;
-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/iso-8859-1_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/iso-8859-1_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/iso-8859-1_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,10 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
-<HTML lang=en-US xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
-<HEAD profile=http://www.w3.org/2000/08/w3c-synd/#>
-<TITLE>iso-8859-1</TITLE>
-</HEAD>
-<BODY>
-<H1 id=logo><IMG height=48 alt="The World Wide Web Consortium (W3C)" src="/Icons/w3c_main" width=315></H1>
-<H2 id=slogan>Leading the Web to Its Full Potential...</H2>
-</BODY>
-</HTML>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.01 Transitional//EN" "http://www.w3c.o rg/TR/1999/REC-html401-19991224/loose.dtd">
+<html lang=en-US xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
+<head profile=http://www.w3.org/2000/08/w3c-synd/#>
+<title>iso-8859-1</title>
+</head>
+<body>
+<h1 id=logo><img height=48 alt="The World Wide Web Consortium (W3C)" src="/Icons/w3c_main" width=315></h1>
+<h2 id=slogan>Leading the Web to Its Full Potential...</h2>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1251_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1251_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1251_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1251 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> windows-1251 </title>
+ </head>

- <BODY>
+ <body>
涛咽吕, 9 �礅 - 腥�皖忸耱� 袜溴驿�磬 疣琊屮屙桢 ��蝽桷�牮桤桉��蝠囗玷蝾�痤耨栝耜钽�汔玎 �赔痤矬 麇疱�蝈痧栩铕棹 雨疣桧�镱赅 礤 铒疣怃嚯桉� 弱 镱�怆屙棹 耧铖钺耱忸忄豚 桧纛痨圉� �耦汶囫梃 箨疣桧耜铋 耱铕铐�磬 耦玟囗桢 戾驿箜囵钿眍�祛龛蝾痂磴钼铋 耧屦蝽铋 觐扈耨梃 �篦囫蜩屐 镳邃耱噔栩咫彘 "绵顼痤爨", 钿磬觐 忮麇痤�耱嚯�桤忮耱眍, 黩�疏邂 镱-镳彐礤祗 耱噔栩 蜞觐�纛痨囹 戾踵龛珈�觐眚痤� 玎 蝠囗玷蝾�镱�耦祉屙桢. 蓄耨� 泐蝾忄 忸珙犴钼栩�恹眢驿屙眍 镳屦忄眄 溻�漤� 磬玎�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1254_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1254_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1254_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1254 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> windows-1254 </title>
+ </head>

- <BODY>
+ <body>
Arama yap齦an en 鏰rp齝�adres, AK Parti Genel Merkezi'nin kars齨da yer alan ve Atat黵k Orman 莍ftli餴'nin s齨齬lar�i鏸nde yer alan Sakl齜ah鏴 mesirelik alan� Polis ekipleri arama 鏰lmalar齨�Sakl齜ah鏴'nin '鏴eba' mevkiinde yo饀nla⺶齬齦d� ...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1255_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1255_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1255_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1255 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> windows-1255 </title>
+ </head>

<body dir="rtl">
犷麽殪 扉狷 澉衢痂 痄 徜珈楮 铄蝣�溽殍珏�祺�熹赳鼹 帙 铋殂辁, 铖铒 "�帔 蝾泮� "囿 忮 玳鲥痖 爨 轺狎 帔 骐妃疱 熹怙 蜢 噫轲� 鲣"�轭�後轹弪 漕铄�彖戾 蜢殄". 噱祛 溴耖�遴铠 腴 溟 溽鬻�铗驿 "铄腴�珈楮 溧��爨 彘���帏忮痖 滂� 犷麽殪 扉狷 澉衢痂 漕汩痖-衢桤屦�殚铤 蜢 �溏扈�铄蝣�溽殍珏� 溧��潇殪��扉囔 熹赳轺 帔 潇玳钿 狲鲥蝥 蜴��囝�狯澍殚�(�) �漕铢熹, 噤邈 噱祛, 腴 "钹�孱蝈祉 钽轲�轾�爨 漶腴钿 屙 忮 玳鲥痖 轺狎 帔 骐妃�...
</body>
-</HTML>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1256_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1256_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-1256_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<HTML>
- <HEAD>
- <TITLE> windows-1256 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> windows-1256 </title>
+ </head>

- <BODY dir="RTL">
+ <body dir="RTL">
泌徜�呤瞧�轻藻硐 谝 轻享�轻抻倾 轻醒勤 轻谟哐�嵬堰�/豌怯/ 阡 奘�算卿砩 沅 啼嫦 轻峭梳轻 轻庞亚祈犴 阌橇 轻礞�轻蹄谏 蓓 峭�轻沅且�热嵯�软�崆屙�糟轻 挢勤 垡�. 孓轻�轻呤瞧�蓓 软卿 嗜涫 蓓�轻逄驺 " 卿�孑�阢犴�吻剌�驿孚砩�抒咪�呤瞧�轻藻硐 谝 轻享�轻抻倾 蓓 轻忧谏 16:20 沅 寝释倾 沅裔 硗梳�轻啼嫦 轻庞亚祈犴礓 蓓 晚 轻俞秦礓 蓓 软�崆屙�糟轻 垩�挢勤 垡�" . 媲智�轻软卿 " 娩 捩�吻丈 沅 呤瞧�轻抻倾 寝释闶 轻沅裔 盟淝�舒翘�谙�沅 轻啼嫦 孓�锰逡 轻闾清湘�卺�轻捩�仍哚 咔汜�媲崾�...
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html Wed Apr 21 18:26:15 2010
@@ -1,13 +1,13 @@
-<HTML>
- <HEAD>
- <TITLE> windows-949 </TITLE>
- </HEAD>
+<html>
+ <head>
+ <title> windows-949 </title>
+ </head>

- <BODY>
+ <body>
茄唱扼寸篮 2岿 烙矫惫雀俊辑 惫雀 郴 气仿青荤 规瘤甫 困茄 '惫雀 气仿规瘤过' 力沥档 眠柳窍扁肺 沁促.

刮林寸篮 弊矾唱 "茄唱扼寸捞 塞阑 菊技况 'MB厩过'阑 碍青 贸府窍妨绊 秦辑 必茄 措摹 惑怕啊 惯窜等 巴篮 芭沸窍瘤 臼篮 盲 具寸捞 气仿沥寸牢 剧 惫刮阑 龋档窍绊 乐促"哥 馆惯沁促.

烙盲柳 八蔓醚厘篮 捞朝 "惫雀 气仿荤怕客 包访等 绊家·绊惯 荤扒 11扒阑 脚加窍绊 傍沥窍霸 枚历洒 荐荤窍扼"绊 瘤矫沁促. 烙 醚厘篮 "惫雀 磊啦鼻篮 弥措茄 粮吝蹬具 窍瘤父, 绊家·绊惯捞 乐绰 父怒 家加 沥寸捞唱 瘤困 绊窍甫 阜沸窍绊 过苞 盔蘑俊 蝶扼 贸府窍扼"绊 富沁促. 茄祈 版蔓篮 碍扁癌 刮畴寸 措钎俊霸 12老, 刮林寸 巩切柳, 刮畴寸 捞沥锐 狼盔俊霸绰 13老 版蔓俊 免籍窍扼绰 傍巩阑 阿阿 惯价沁促.
- </BODY>
-</HTML>
+ </body>
+</html>

Modified: trunk/src/chrome/test/data/encoding_tests/user_override/expected_gb18030_saved_from_iso88591_meta.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/user_override/expected_gb18030_saved_from_iso88591_meta.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/user_override/expected_gb18030_saved_from_iso88591_meta.html Wed Apr 21 18:26:15 2010
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!-- saved from url=(0077)http://mock.http/encoding_tests/user_override/gb18030_with_iso88591_meta.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=gb18030">
-<TITLE>中国制造的领军者3名</TITLE>
-</HEAD><BODY>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=gb18030">
+<title>中国制造的领军者3名</title>
+</head><body>
中国制造的领军者3名;

马兴瑞,中国航天科技集团公司总经理,用令世界震惊的航天“中国速度”,马兴瑞推动中国航天进入太空行走时代;
@@ -16,4 +16,4 @@
万捷,雅昌企业集团有限公司董事长,他创造性将传统印刷业与现代IT技术完美融合,在毕升发明印刷术900多年后,他为印刷术的故乡重新赢得了骄傲和尊严;

韩三平,中国电影集团公司董事长,从《无极》、《投名状》到《赤壁》、《梅兰芳》,由韩三平领导的中影团队使中国电影开始进入成熟的大片时代;
-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/encoding_tests/user_override/gb18030_with_iso88591_meta.html
==============================================================================
--- trunk/src/chrome/test/data/encoding_tests/user_override/gb18030_with_iso88591_meta.html (original)
+++ trunk/src/chrome/test/data/encoding_tests/user_override/gb18030_with_iso88591_meta.html Wed Apr 21 18:26:15 2010
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!-- saved from url=(0023)http://www.sina.com.cn/ -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<TITLE>中国制造的领军者3名</TITLE>
-</HEAD>
-<BODY>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>中国制造的领军者3名</title>
+</head>
+<body>
中国制造的领军者3名;

马兴瑞,中国航天科技集团公司总经理,用令世界震惊的航天“中国速度”,马兴瑞推动中国航天进入太空行走时代;
@@ -17,4 +17,4 @@
万捷,雅昌企业集团有限公司董事长,他创造性将传统印刷业与现代IT技术完美融合,在毕升发明印刷术900多年后,他为印刷术的故乡重新赢得了骄傲和尊严;

韩三平,中国电影集团公司董事长,从《无极》、《投名状》到《赤壁》、《梅兰芳》,由韩三平领导的中影团队使中国电影开始进入成熟的大片时代;
-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/save_page/b.saved1.htm
==============================================================================
--- trunk/src/chrome/test/data/save_page/b.saved1.htm (original)
+++ trunk/src/chrome/test/data/save_page/b.saved1.htm Wed Apr 21 18:26:15 2010
@@ -1,12 +1,12 @@

<!-- saved from url=(0032)http://mock.http/save_page/b.htm -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <TITLE>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>
Test page for saving page feature
- </TITLE>
- <LINK type="text/css" href="./b_files/1.css" rel="stylesheet">
- </HEAD><BODY>
- The picture below is the back button.<BR>
- <IMG src="./b_files/1.png">
+ </title>
+ <link type="text/css" href="./b_files/1.css" rel="stylesheet">
+ </head><body>
+ The picture below is the back button.<br>
+ <img src="./b_files/1.png">

-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/data/save_page/b.saved2.htm
==============================================================================
--- trunk/src/chrome/test/data/save_page/b.saved2.htm (original)
+++ trunk/src/chrome/test/data/save_page/b.saved2.htm Wed Apr 21 18:26:15 2010
@@ -1,12 +1,12 @@

<!-- saved from url=(0032)http://mock.http/save_page/b.htm -->
-<HTML><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <TITLE>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>
Test page for saving page feature
- </TITLE>
- <LINK type="text/css" href="./Test page for saving page feature_files/1.css" rel="stylesheet">
- </HEAD><BODY>
- The picture below is the back button.<BR>
- <IMG src="./Test page for saving page feature_files/1.png">
+ </title>
+ <link type="text/css" href="./Test page for saving page feature_files/1.css" rel="stylesheet">
+ </head><body>
+ The picture below is the back button.<br>
+ <img src="./Test page for saving page feature_files/1.png">

-</BODY></HTML>
\ No newline at end of file
+</body></html>
\ No newline at end of file

Modified: trunk/src/chrome/test/ui/ui_test.cc
==============================================================================
--- trunk/src/chrome/test/ui/ui_test.cc (original)
+++ trunk/src/chrome/test/ui/ui_test.cc Wed Apr 21 18:26:15 2010
@@ -1046,11 +1046,12 @@
return source_history_file;
}

-void UITestBase::WaitForGeneratedFileAndCheck(const FilePath& generated_file,
- const FilePath& original_file,
- bool compare_files,
- bool need_equal,
- bool delete_generated_file) {
+void UITestBase::WaitForGeneratedFileAndCheck(
+ const FilePath& generated_file,
+ const FilePath& original_file,
+ bool compare_files,
+ bool need_equal,
+ bool delete_generated_file) {
// Check whether the target file has been generated.
file_util::FileInfo previous, current;
bool exist = false;

Modified: trunk/src/webkit/glue/dom_serializer_unittest.cc
==============================================================================
--- trunk/src/webkit/glue/dom_serializer_unittest.cc (original)
+++ trunk/src/webkit/glue/dom_serializer_unittest.cc Wed Apr 21 18:26:15 2010
@@ -281,7 +281,7 @@

// If original contents have document type, the serialized contents also have
// document type.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithDocType) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithDocType) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("youtube_1.htm");
@@ -310,7 +310,7 @@

// If original contents do not have document type, the serialized contents
// also do not have document type.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithoutDocType) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithoutDocType) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("youtube_2.htm");
@@ -340,7 +340,7 @@
// Serialize XML document which has all 5 built-in entities. After
// finishing serialization, the serialized contents should be same
// with original XML document.
-TEST_F(DomSerializerTests, SerialzeXMLDocWithBuiltInEntities) {
+TEST_F(DomSerializerTests, SerializeXMLDocWithBuiltInEntities) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("note.xml");
@@ -362,7 +362,7 @@
}

// When serializing DOM, we add MOTW declaration before html tag.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithAddingMOTW) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithAddingMOTW) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("youtube_2.htm");
@@ -396,7 +396,7 @@
// declaration as first child of HEAD element for resolving WebKit bug:
// http://bugs.webkit.org/show_bug.cgi?id=16621 even the original document
// does not have META charset declaration.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("youtube_1.htm");
@@ -459,7 +459,7 @@
// as first child of HEAD element and remove all original META charset
// declarations.
TEST_F(DomSerializerTests,
- SerialzeHTMLDOMWithMultipleMetaCharsetInOriginalDoc) {
+ SerializeHTMLDOMWithMultipleMetaCharsetInOriginalDoc) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("youtube_2.htm");
@@ -523,7 +523,7 @@
}

// Test situation of html entities in text when serializing HTML DOM.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInText) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII(
"dom_serializer/htmlentities_in_text.htm");
@@ -533,7 +533,7 @@
ASSERT_TRUE(file_url.SchemeIsFile());
// Test contents.
static const char* const original_contents =
- "<HTML><BODY>&amp;&lt;&gt;\"\'</BODY></HTML>";
+ "<html><body>&amp;&lt;&gt;\"\'</body></html>";
// Load the test contents.
LoadContents(original_contents, file_url, WebString());

@@ -567,14 +567,14 @@
// find WebCore-generated HEAD element.
if (!doc.head().isNull()) {
WebString encoding = web_frame->encoding();
- std::string htmlTag("<HTML>");
+ std::string htmlTag("<html>");
std::string::size_type pos = original_str.find(htmlTag);
ASSERT_NE(std::string::npos, pos);
pos += htmlTag.length();
- std::string head_part("<HEAD>");
+ std::string head_part("<head>");
head_part +=
WebPageSerializer::generateMetaCharsetDeclaration(encoding).utf8();
- head_part += "</HEAD>";
+ head_part += "</head>";
original_str.insert(pos, head_part);
}
ASSERT_EQ(original_str, serialized_contents);
@@ -582,7 +582,7 @@

// Test situation of html entities in attribute value when serializing
// HTML DOM.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInAttributeValue) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInAttributeValue) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII(
"dom_serializer/htmlentities_in_attribute_value.htm");
@@ -631,7 +631,7 @@
}

// Test situation of non-standard HTML entities when serializing HTML DOM.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNonStandardEntities) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithNonStandardEntities) {
// Make a test file URL and load it.
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
@@ -672,7 +672,7 @@
// When serializing, we should comment the BASE tag, append a new BASE tag.
// rewrite all the savable URLs to relative local path, and change other URLs
// to absolute URLs.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithBaseTag) {
// There are total 2 available base tags in this test file.
const int kTotalBaseTagCountInTestFile = 2;

@@ -779,7 +779,7 @@
}

// Serializing page which has an empty HEAD tag.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEmptyHead) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEmptyHead) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");
page_file_path = page_file_path.AppendASCII("empty_head.htm");
@@ -788,7 +788,7 @@

// Load the test html content.
static const char* const empty_head_contents =
- "<HTML><HEAD></HEAD><BODY>hello world</BODY></HTML>";
+ "<html><head></head><body>hello world</body></html>";
LoadContents(empty_head_contents, file_url, WebString());

// Make sure the head tag is empty.

--
Automated mail for updates to http://src.chromium.org/viewvc/chrome
Subscription options: http://groups.google.com/a/chromium.org/group/chromium-checkins

Reply all
Reply to author
Forward
0 new messages