Move file_util_icu to base::i18n namespace

base/i18n/file_util_icu.h

Index: base/i18n/file_util_icu.h
diff --git a/base/i18n/file_util_icu.h b/base/i18n/file_util_icu.h
index 15526c3a645c92b5d88a9f99543a48df2a6c44a6..7dd94cd9b06d2ab7ca3751a8b129dcf7237e4885 100644
--- a/base/i18n/file_util_icu.h
+++ b/base/i18n/file_util_icu.h
@@ -11,11 +11,12 @@
 #include "base/i18n/base_i18n_export.h"
 #include "base/strings/string16.h"
 
-namespace file_util {
+namespace base {
+namespace i18n {
 
 // Returns true if file_name does not have any illegal character. The input
 // param has the same restriction as that for ReplaceIllegalCharacters.
-BASE_I18N_EXPORT bool IsFilenameLegal(const base::string16& file_name);
+BASE_I18N_EXPORT bool IsFilenameLegal(const string16& file_name);
 
 // Replaces characters in 'file_name' that are illegal for file names with
 // 'replace_char'. 'file_name' must not be a full or relative path, but just the
@@ -25,19 +26,20 @@ BASE_I18N_EXPORT bool IsFilenameLegal(const base::string16& file_name);
 //   file_name == "bad:file*name?.txt", changed to: "bad-file-name-.txt" when
 //   'replace_char' is '-'.
 BASE_I18N_EXPORT void ReplaceIllegalCharactersInPath(
-    base::FilePath::StringType* file_name,
+    FilePath::StringType* file_name,
     char replace_char);
 
 // Compares two filenames using the current locale information. This can be
 // used to sort directory listings. It behaves like "operator<" for use in
 // std::sort.
-BASE_I18N_EXPORT bool LocaleAwareCompareFilenames(const base::FilePath& a,
-                                                  const base::FilePath& b);
+BASE_I18N_EXPORT bool LocaleAwareCompareFilenames(const FilePath& a,
+                                                  const FilePath& b);
 
 // Calculates the canonical file-system representation of |file_name| base name.
 // Modifies |file_name| in place. No-op if not on ChromeOS.
-BASE_I18N_EXPORT void NormalizeFileNameEncoding(base::FilePath* file_name);
+BASE_I18N_EXPORT void NormalizeFileNameEncoding(FilePath* file_name);
 
-}  // namespace file_util
+}  // namespace i18n
+}  // namespace base
 
 #endif  // BASE_I18N_FILE_UTIL_ICU_H_