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

chrome/browser/browser_encoding_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ skipping 18 matching lines @@
 
 struct EncodingTestData {
   const char* file_name;
   const char* encoding_name;
 };
 
 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" },
   { "ISO-8859-6.html", "ISO-8859-6" },
   { "ISO-8859-7.html", "ISO-8859-7" },
   { "ISO-8859-8.html", "ISO-8859-8" },
   { "ISO-8859-13.html", "ISO-8859-13" },
   { "ISO-8859-15.html", "ISO-8859-15" },
   { "KOI8-R.html", "KOI8-R" },
   { "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" },
   { "EUC-KR.html", "EUC-KR" },
   { "windows-1250.html", "windows-1250" },
   { "windows-1251.html", "windows-1251" },
   { "windows-1252.html", "windows-1252" },
   { "windows-1253.html", "windows-1253" },
   { "windows-1254.html", "windows-1254" },
   { "windows-1255.html", "windows-1255" },
@@ skipping 62 matching lines @@
         content::BrowserContext::GetDownloadManager(browser()->profile()),
         loop_runner->QuitClosure());
     browser()->tab_strip_model()->GetActiveWebContents()->SavePage(
         full_file_name, temp_sub_resource_dir_,
         content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML);
     loop_runner->Run();
 
     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 {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     save_dir_ = temp_dir_.path();
     temp_sub_resource_dir_ = save_dir_.AppendASCII("sub_resource_files");
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
@@ skipping 36 matching lines @@
       "expected_gb18030_saved_from_iso88591_meta.html";
   const char* const kOverrideTestDir = "user_override";
 
   base::FilePath test_dir_path =
       base::FilePath(kTestDir).AppendASCII(kOverrideTestDir);
   test_dir_path = test_dir_path.AppendASCII(kTestFileName);
   GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
   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 =
       CharacterEncoding::GetCanonicalEncodingNameByAliasName("gb18030");
   content::TestNavigationObserver navigation_observer(web_contents);
   web_contents->SetOverrideEncoding(selected_encoding);
   navigation_observer.Wait();
   EXPECT_EQ("gb18030", web_contents->GetEncoding());
 
   base::FilePath expected_filename =
@@ skipping 31 matching lines @@
     const char* expected_result;  // File name of expected results.
     const char* expected_encoding;   // expected encoding.
   };
   const EncodingAutoDetectTestData kTestDatas[] = {
       { "Big5_with_no_encoding_specified.html",
         "expected_Big5_saved_from_no_encoding_specified.html",
         "Big5" },
       { "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" },
       { "ISO-8859-6_with_no_encoding_specified.html",
         "expected_ISO-8859-6_saved_from_no_encoding_specified.html",
         "ISO-8859-6" },
       { "ISO-8859-7_with_no_encoding_specified.html",
         "expected_ISO-8859-7_saved_from_no_encoding_specified.html",
         "ISO-8859-7" },
       { "ISO-8859-8_with_no_encoding_specified.html",
@@ skipping 66 matching lines @@
 
     // Dump the page, the content of dump page should be equal with our expect
     // result file.
     base::FilePath expected_result_file_name =
         base::FilePath().AppendASCII(kAutoDetectDir).
         AppendASCII(kExpectedResultDir).
         AppendASCII(kTestDatas[i].expected_result);
     SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
   }
 }