Replace FilePath with base::FilePath.

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/file_path.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 119 matching lines @@
 };
 
 }  // namespace
 
 namespace file_util {
 
 bool IsFilenameLegal(const string16& file_name) {
   return IllegalCharacters::GetInstance()->containsNone(file_name);
 }
 
-void ReplaceIllegalCharactersInPath(FilePath::StringType* file_name,
+void ReplaceIllegalCharactersInPath(base::FilePath::StringType* file_name,
                                     char replace_char) {
   DCHECK(file_name);
 
   DCHECK(!(IllegalCharacters::GetInstance()->contains(replace_char)));
 
   // Remove leading and trailing whitespace.
   TrimWhitespace(*file_name, TRIM_ALL, file_name);
 
   IllegalCharacters* illegal = IllegalCharacters::GetInstance();
   int cursor = 0;  // The ICU macros expect an int.
@@ skipping 22 matching lines @@
     if (illegal->contains(code_point)) {
       file_name->replace(char_begin, cursor - char_begin, 1, replace_char);
       // We just made the potentially multi-byte/word char into one that only
       // takes one byte/word, so need to adjust the cursor to point to the next
       // character again.
       cursor = char_begin + 1;
     }
   }
 }
 
-bool LocaleAwareCompareFilenames(const FilePath& a, const FilePath& b) {
+bool LocaleAwareCompareFilenames(const base::FilePath& a,
+                                 const base::FilePath& b) {
 #if defined(OS_WIN)
   return LocaleAwareComparator::GetInstance()->Compare(a.value().c_str(),
                                                        b.value().c_str()) < 0;
 
 #elif defined(OS_POSIX)
   // On linux, the file system encoding is not defined. We assume
   // SysNativeMBToWide takes care of it.
   //
   // ICU's collator can take strings in OS native encoding. But we convert the
   // strings to UTF-16 ourselves to ensure conversion consistency.
   // TODO(yuzo): Perhaps we should define SysNativeMBToUTF16?
   return LocaleAwareComparator::GetInstance()->Compare(
       WideToUTF16(base::SysNativeMBToWide(a.value().c_str())),
       WideToUTF16(base::SysNativeMBToWide(b.value().c_str()))) < 0;
 #else
   #error Not implemented on your system
 #endif
 }
 
-void NormalizeFileNameEncoding(FilePath* file_name) {
+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(FilePath(normalized_str));
+    *file_name = file_name->DirName().Append(base::FilePath(normalized_str));
   }
 #endif
 }
 
 }  // namespace