diff options
| author | jshin <jshin@chromium.org> | 2014-10-16 23:10:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-17 06:11:05 +0000 |
| commit | 51a1d05292ca2813ef6f74e61c1d5e390e2a4f3f (patch) | |
| tree | fb42ded10241fcfc67f05cd05930faa7071c97f6 /chrome/browser/download/save_page_browsertest.cc | |
| parent | 91d3b69357342a5d47595e81791d6b56aac531b6 (diff) | |
| download | chromium_src-51a1d05292ca2813ef6f74e61c1d5e390e2a4f3f.zip chromium_src-51a1d05292ca2813ef6f74e61c1d5e390e2a4f3f.tar.gz chromium_src-51a1d05292ca2813ef6f74e61c1d5e390e2a4f3f.tar.bz2 | |
Prepare for ISO-8859-1 to windows-1252 switch
The following Blink CL will make 'windows-1252' the canonical name
for 'ISO-8859-1', 'US-ASCII' and 'windows-1252'. All three will be
treated synonymously per the WHATWG Encoding spec.
https://codereview.chromium.org/655083002/
We have some test results with 'ISO-8859-1'. Change them to use
windows-1252 and disable them before landing the above Blink CL.
For PrefsTabHelperBrowserTest.WebPrefs, I made the test more robust
by setting 'windows-1251' (not '1252') as the default charset in
the Test Preference file.
Once the Blink CL is landed and rolled, we'll re-enable the disabled
tests as a part of the following Cr CL:
https://codereview.chromium.org/649413002/ ,
which rolls ICU 52 to the latest revision (the other side of
ISO-8859-1 to windows-1252 transition).
TBR=jochen,rdsmith,mnissler,jsbell
BUG=412053
TEST=browser_tests the following tests (before and after the Blink roll)
BrowserEncodingTest.TestEncodingAutoDetect
BrowserEncodingTest.TestOverrideEncoding
EncodingAliases/BrowserEncodingTest.TestEncodingAliasMapping
SavePageBrowserTest.FileNameFromPageTitle
SavePageBrowserTest.SaveCompleteHTML
PrefsTabHelperBrowserTest.WebPrefs
Review URL: https://codereview.chromium.org/643993004
Cr-Commit-Position: refs/heads/master@{#300069}
Diffstat (limited to 'chrome/browser/download/save_page_browsertest.cc')
| -rw-r--r-- | chrome/browser/download/save_page_browsertest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 76933a6..b189080 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -561,9 +561,13 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveCompleteHTML) { EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_TRUE(base::PathExists(dir)); +#if 0 + // Disabled until the following Blink CL is relanded and rolled: + // https://codereview.chromium.org/649413002 EXPECT_TRUE(base::TextContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("b.saved1.htm"), full_file_name)); +#endif EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("1.png"), dir.AppendASCII("1.png"))); @@ -657,9 +661,13 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_FileNameFromPageTitle) { EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_TRUE(base::PathExists(dir)); +#if 0 + // Disabled until the following Blink CL is relanded and rolled: + // https://codereview.chromium.org/649413002 EXPECT_TRUE(base::TextContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("b.saved2.htm"), full_file_name)); +#endif EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("1.png"), dir.AppendASCII("1.png"))); |