summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorjnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 14:51:10 +0000
committerjnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 14:51:10 +0000
commitaacd7cc1c7283ec41fa47334a20e3ffd1f8e4d51 (patch)
tree20fed6384f84ba0a3231bae16742f486c2836fac /chrome/browser/browser_encoding_uitest.cc
parent725c98edd346e39782305a833372c2be9a854eba (diff)
downloadchromium_src-aacd7cc1c7283ec41fa47334a20e3ffd1f8e4d51.zip
chromium_src-aacd7cc1c7283ec41fa47334a20e3ffd1f8e4d51.tar.gz
chromium_src-aacd7cc1c7283ec41fa47334a20e3ffd1f8e4d51.tar.bz2
Alias 'US-ASCII' to 'ISO-8859-1' in our UI without touching webkit.BUG=15801
TEST=Add US-ASCII encoding to browser encoding test Review URL: http://codereview.chromium.org/178017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index b961705..80ed566 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -75,6 +75,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
{ "KOI8-U.html", L"KOI8-U" },
{ "macintosh.html", L"macintosh" },
{ "Shift-JIS.html", L"Shift_JIS" },
+ { "US-ASCII.html", L"ISO-8859-1" }, // http://crbug.com/15801
{ "UTF-8.html", L"UTF-8" },
{ "UTF-16LE.html", L"UTF-16LE" },
{ "windows-874.html", L"windows-874" },