Roll src/third_party/icu 8ac906f:d8b2a9d (svn 292317:292476)

chrome/browser/browser_encoding_browsertest.cc

Index: chrome/browser/browser_encoding_browsertest.cc
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index d80694db24a4377cd3603f8c2fe8c9a25e38a78c..627e21a47c5b0ae62873dd26c1c40efed0323bc5 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -36,11 +36,7 @@ const EncodingTestData kEncodingTestDatas[] = {
   { "Big5.html", "Big5" },
   { "EUC-JP.html", "EUC-JP" },
   { "gb18030.html", "gb18030" },
-#if 0
-  // Disable temporarily until Blink CL
-  // (https://codereview.chromium.org/655083002/) is relanded.
   { "iso-8859-1.html", "windows-1252" },
-#endif
   { "ISO-8859-2.html", "ISO-8859-2" },
   { "ISO-8859-4.html", "ISO-8859-4" },
   { "ISO-8859-5.html", "ISO-8859-5" },
@@ -53,10 +49,7 @@ const EncodingTestData kEncodingTestDatas[] = {
   { "KOI8-U.html", "KOI8-U" },
   { "macintosh.html", "macintosh" },
   { "Shift-JIS.html", "Shift_JIS" },
-#if 0
-  // See the above.
   { "US-ASCII.html", "windows-1252" },  // http://crbug.com/15801
-#endif
   { "UTF-8.html", "UTF-8" },
   { "UTF-16LE.html", "UTF-16LE" },
   { "windows-874.html", "windows-874" },
@@ -139,7 +132,9 @@ class BrowserEncodingTest
     base::FilePath expected_file_name = ui_test_utils::GetTestFilePath(
         base::FilePath(kTestDir), expected);
 
-    EXPECT_TRUE(base::ContentsEqual(full_file_name, expected_file_name));
+    EXPECT_TRUE(base::ContentsEqual(full_file_name, expected_file_name)) <<
+        "generated_file = " << full_file_name.AsUTF8Unsafe() <<
+        ", expected_file = " << expected_file_name.AsUTF8Unsafe();
   }
 
   virtual void SetUpOnMainThread() override {
@@ -196,10 +191,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-#if 0
-  // Temporarily disable until the Blink CL to use windows-1252 is relanded.
   EXPECT_EQ("windows-1252", web_contents->GetEncoding());
-#endif
 
   // Override the encoding to "gb18030".
   const std::string selected_encoding =
@@ -251,12 +243,9 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
       { "gb18030_with_no_encoding_specified.html",
         "expected_gb18030_saved_from_no_encoding_specified.html",
         "gb18030" },
-#if 0
-      // Disable until the Blink CL to use 'windows-1252' is relanded.
       { "iso-8859-1_with_no_encoding_specified.html",
         "expected_iso-8859-1_saved_from_no_encoding_specified.html",
         "windows-1252" },
-#endif
       { "ISO-8859-5_with_no_encoding_specified.html",
         "expected_ISO-8859-5_saved_from_no_encoding_specified.html",
         "ISO-8859-5" },