Replace ICU encoding detection with CED

net/ftp/ftp_directory_listing_parser.cc

 // Copyright (c) 2011 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 "net/ftp/ftp_directory_listing_parser.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/i18n/icu_encoding_detection.h"
+#include "base/i18n/encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/ftp/ftp_directory_listing_parser_ls.h"
 #include "net/ftp/ftp_directory_listing_parser_vms.h"
 #include "net/ftp/ftp_directory_listing_parser_windows.h"
 #include "net/ftp/ftp_server_type_histograms.h"
@@ skipping 57 matching lines @@
   entries->clear();
   return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
 }
 
 // Detects encoding of |text| and parses it as an FTP directory listing.
 // Fills in |entries| and |server_type| and returns network error code.
 int DecodeAndParse(const std::string& text,
                    const base::Time& current_time,
                    std::vector<FtpDirectoryListingEntry>* entries,
                    FtpServerType* server_type) {
-  const char* const kNewlineSeparators[] = { "\n", "\r\n" };
+  std::string encoding;
+  if (!base::DetectEncoding(text, &encoding))
+    return ERR_ENCODING_DETECTION_FAILED;
+  const char* encoding_name = encoding.c_str();
 
-  std::vector<std::string> encodings;
-  if (!base::DetectAllEncodings(text, &encodings))
-    return ERR_ENCODING_DETECTION_FAILED;
+  base::string16 converted_text;
+  if (base::CodepageToUTF16(text, encoding_name,

[cbentzel, 2016/08/10 01:52:00]

I assume that encoding names are the same in CED as in ICU?

[Jinsuk Kim, 2016/08/10 02:15:13]

They are not precisely the same. CED returns IANA standard-compliant names. But
ICU which |base::CodepageToUTF16| is based on has no problem understanding them.
It uses the following table for sanitizing the names
https://cs.chromium.org/chromium/src/third_party/icu/source/data/mappings/con...

+                            base::OnStringConversionError::FAIL,
+                            &converted_text)) {
+    const char* const kNewlineSeparators[] = {"\n", "\r\n"};
 
-  // Use first encoding that can be used to decode the text.
-  for (size_t i = 0; i < encodings.size(); i++) {
-    base::string16 converted_text;
-    if (base::CodepageToUTF16(text,
-                              encodings[i].c_str(),
-                              base::OnStringConversionError::FAIL,
-                              &converted_text)) {
-      for (size_t j = 0; j < arraysize(kNewlineSeparators); j++) {
-        int rv = ParseListing(converted_text,
-                              base::ASCIIToUTF16(kNewlineSeparators[j]),
-                              encodings[i],
-                              current_time,
-                              entries,
-                              server_type);
-        if (rv == OK)
-          return rv;
-      }
+    for (size_t j = 0; j < arraysize(kNewlineSeparators); j++) {
+      int rv = ParseListing(converted_text,
+                            base::ASCIIToUTF16(kNewlineSeparators[j]),
+                            encoding_name, current_time, entries, server_type);
+      if (rv == OK)
+        return rv;
     }
   }
 
   entries->clear();
   *server_type = SERVER_UNKNOWN;
   return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
 }
 
 }  // namespace
 
 FtpDirectoryListingEntry::FtpDirectoryListingEntry()
     : type(UNKNOWN),
       size(-1) {
 }
 
 int ParseFtpDirectoryListing(const std::string& text,
                              const base::Time& current_time,
                              std::vector<FtpDirectoryListingEntry>* entries) {
   FtpServerType server_type = SERVER_UNKNOWN;
   int rv = DecodeAndParse(text, current_time, entries, &server_type);
   UpdateFtpServerTypeHistograms(server_type);
   return rv;
 }
 
 }  // namespace net