Replace ICU encoding detection with CED

content/child/ftp_directory_listing_response_delegate.cc

 // Copyright 2014 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 "content/child/ftp_directory_listing_response_delegate.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
-#include "base/i18n/icu_encoding_detection.h"
+#include "base/i18n/encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/child/weburlresponse_extradata_impl.h"
 #include "net/base/directory_listing.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
@@ skipping 10 matching lines @@
 
 base::string16 ConvertPathToUTF16(const std::string& path) {
   // Per RFC 2640, FTP servers should use UTF-8 or its proper subset ASCII,
   // but many old FTP servers use legacy encodings. Try UTF-8 first.
   if (base::IsStringUTF8(path))
     return base::UTF8ToUTF16(path);
 
   // Try detecting the encoding. The sample is rather small though, so it may
   // fail.
   std::string encoding;
-  if (base::DetectEncoding(path, &encoding) && !encoding.empty()) {
+  if (base::DetectEncoding(path, &encoding) && encoding != "US-ASCII") {
     base::string16 path_utf16;
     if (base::CodepageToUTF16(path, encoding.c_str(),
                               base::OnStringConversionError::SUBSTITUTE,
                               &path_utf16)) {
       return path_utf16;
     }
   }
 
   // Use system native encoding as the last resort.
   return base::WideToUTF16(base::SysNativeMBToWide(path));
@@ skipping 75 matching lines @@
 
 void FtpDirectoryListingResponseDelegate::SendDataToClient(
     const std::string& data) {
   if (client_) {
     client_->didReceiveData(loader_, data.data(), data.length(), -1,
                             data.length());
   }
 }
 
 }  // namespace content