Remove UTF string conversion functions from the global namespace.

base/i18n/file_util_icu.cc

Index: base/i18n/file_util_icu.cc
diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc
index 9b0525086d0166d73657292880130737edc5cd90..3864d225a7dde876d69b279b985a65c363aa53e7 100644
--- a/base/i18n/file_util_icu.cc
+++ b/base/i18n/file_util_icu.cc
@@ -145,14 +145,16 @@ bool LocaleAwareCompareFilenames(const base::FilePath& a,
 
 #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