Consolidate most of net/'s icu_string_conversions.h dependencies.

net/base/filename_util.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 "net/base/filename_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/i18n/file_util_icu.h"
-#include "base/i18n/icu_string_conversions.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
+#include "net/base/net_string_util.h"
 #include "net/http/http_content_disposition.h"
 #include "url/gurl.h"
 
 namespace net {
 
 namespace {
 
 // what we prepend to get a file URL
 static const base::FilePath::CharType kFileURLPrefix[] =
     FILE_PATH_LITERAL("file:///");
@@ skipping 42 matching lines @@
       url.ExtractFileName(),
       UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
 
   // The URL's path should be escaped UTF-8, but may not be.
   std::string decoded_filename = unescaped_url_filename;
   if (!IsStringUTF8(decoded_filename)) {
     // TODO(jshin): this is probably not robust enough. To be sure, we need
     // encoding detection.
     base::string16 utf16_output;
     if (!referrer_charset.empty() &&
-        base::CodepageToUTF16(unescaped_url_filename,
-                              referrer_charset.c_str(),
-                              base::OnStringConversionError::FAIL,
-                              &utf16_output)) {
+        net::ConvertToUTF16(unescaped_url_filename,
+                            referrer_charset.c_str(),
+                            &utf16_output)) {
       decoded_filename = base::UTF16ToUTF8(utf16_output);
     } else {
       decoded_filename = base::WideToUTF8(
           base::SysNativeMBToWide(unescaped_url_filename));
     }
   }
   // If the URL contains a (possibly empty) query, assume it is a generator, and
   // allow the determined extension to be overwritten.
   *should_overwrite_extension = !decoded_filename.empty() && url.has_query();
 
@@ skipping 403 matching lines @@
   // utf8 encoded characters in name.
   file_util::NormalizeFileNameEncoding(&generated_name);
 #endif
 
   DCHECK(!generated_name.empty());
 
   return generated_name;
 }
 
 }  // namespace net