Remove UTF string conversion functions from the global namespace.

base/i18n/file_util_icu.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.
 
 // File utilities that use the ICU library go in this file.
 
 #include "base/i18n/file_util_icu.h"
 
 #include "base/files/file_path.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 127 matching lines @@
   UErrorCode error_code = U_ZERO_ERROR;
   // Use the default collator. The default locale should have been properly
   // set by the time this constructor is called.
   scoped_ptr<icu::Collator> collator(icu::Collator::createInstance(error_code));
   DCHECK(U_SUCCESS(error_code));
   // Make it case-sensitive.
   collator->setStrength(icu::Collator::TERTIARY);
 
 #if defined(OS_WIN)
   return base::i18n::CompareString16WithCollator(collator.get(),
-      WideToUTF16(a.value()), WideToUTF16(b.value())) == UCOL_LESS;
+      base::WideToUTF16(a.value()), base::WideToUTF16(b.value())) == UCOL_LESS;
 
 #elif defined(OS_POSIX)
   // On linux, the file system encoding is not defined. We assume
   // SysNativeMBToWide takes care of it.
-  return base::i18n::CompareString16WithCollator(collator.get(),
-      WideToUTF16(base::SysNativeMBToWide(a.value().c_str())),
-      WideToUTF16(base::SysNativeMBToWide(b.value().c_str()))) == UCOL_LESS;
+  return base::i18n::CompareString16WithCollator(
+      collator.get(),
+      base::WideToUTF16(base::SysNativeMBToWide(a.value().c_str())),
+      base::WideToUTF16(base::SysNativeMBToWide(b.value().c_str()))
+      ) == UCOL_LESS;
 #else
   #error Not implemented on your system
 #endif
 }
 
 void NormalizeFileNameEncoding(base::FilePath* file_name) {
 #if defined(OS_CHROMEOS)
   std::string normalized_str;
   if (base::ConvertToUtf8AndNormalize(file_name->BaseName().value(),
                                       base::kCodepageUTF8,
                                       &normalized_str)) {
     *file_name = file_name->DirName().Append(base::FilePath(normalized_str));
   }
 #endif
 }
 
 }  // namespace