Replace FilePath with base::FilePath in some more top level directories.

ui/base/resource/resource_bundle.cc

Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 6ced08564e45d7bf08fd46dbf90b53a29dd1676d..2325507f4d977fad170fd83fb3ba70b6c6230373 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -153,7 +153,7 @@ void ResourceBundle::InitSharedInstanceWithPakFile(
 }
 
 // static
-void ResourceBundle::InitSharedInstanceWithPakPath(const FilePath& path) {
+void ResourceBundle::InitSharedInstanceWithPakPath(const base::FilePath& path) {
   DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
   g_shared_instance_ = new ResourceBundle(NULL);
 
@@ -184,12 +184,12 @@ bool ResourceBundle::LocaleDataPakExists(const std::string& locale) {
   return !GetLocaleFilePath(locale, true).empty();
 }
 
-void ResourceBundle::AddDataPackFromPath(const FilePath& path,
+void ResourceBundle::AddDataPackFromPath(const base::FilePath& path,
                                          ScaleFactor scale_factor) {
   AddDataPackFromPathInternal(path, scale_factor, false);
 }
 
-void ResourceBundle::AddOptionalDataPackFromPath(const FilePath& path,
+void ResourceBundle::AddOptionalDataPackFromPath(const base::FilePath& path,
                                          ScaleFactor scale_factor) {
   AddDataPackFromPathInternal(path, scale_factor, true);
 }
@@ -210,9 +210,9 @@ void ResourceBundle::AddDataPackFromFile(base::PlatformFile file,
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
                                            bool test_file_exists) {
   if (app_locale.empty())
-    return FilePath();
+    return base::FilePath();
 
-  FilePath locale_file_path;
+  base::FilePath locale_file_path;
 
   PathService::Get(ui::DIR_LOCALES, &locale_file_path);
 
@@ -226,10 +226,10 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
 
   // Don't try to load empty values or values that are not absolute paths.
   if (locale_file_path.empty() || !locale_file_path.IsAbsolute())
-    return FilePath();
+    return base::FilePath();
 
   if (test_file_exists && !file_util::PathExists(locale_file_path))
-    return FilePath();
+    return base::FilePath();
 
   return locale_file_path;
 }
@@ -239,7 +239,7 @@ std::string ResourceBundle::LoadLocaleResources(
     const std::string& pref_locale) {
   DCHECK(!locale_resources_data_.get()) << "locale.pak already loaded";
   std::string app_locale = l10n_util::GetApplicationLocale(pref_locale);
-  FilePath locale_file_path = GetOverriddenPakPath();
+  base::FilePath locale_file_path = GetOverriddenPakPath();
   if (locale_file_path.empty()) {
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kLocalePak)) {
@@ -270,8 +270,8 @@ std::string ResourceBundle::LoadLocaleResources(
   return app_locale;
 }
 
-void ResourceBundle::LoadTestResources(const FilePath& path,
-                                       const FilePath& locale_path) {
+void ResourceBundle::LoadTestResources(const base::FilePath& path,
+                                       const base::FilePath& locale_path) {
   // Use the given resource pak for both common and localized resources.
   scoped_ptr<DataPack> data_pack(
       new DataPack(SCALE_FACTOR_100P));
@@ -291,11 +291,11 @@ void ResourceBundle::UnloadLocaleResources() {
   locale_resources_data_.reset();
 }
 
-void ResourceBundle::OverrideLocalePakForTest(const FilePath& pak_path) {
+void ResourceBundle::OverrideLocalePakForTest(const base::FilePath& pak_path) {
   overridden_pak_path_ = pak_path;
 }
 
-const FilePath& ResourceBundle::GetOverriddenPakPath() {
+const base::FilePath& ResourceBundle::GetOverriddenPakPath() {
   return overridden_pak_path_;
 }
 
@@ -508,14 +508,14 @@ void ResourceBundle::FreeImages() {
   images_.clear();
 }
 
-void ResourceBundle::AddDataPackFromPathInternal(const FilePath& path,
+void ResourceBundle::AddDataPackFromPathInternal(const base::FilePath& path,
                                                  ScaleFactor scale_factor,
                                                  bool optional) {
   // Do not pass an empty |path| value to this method. If the absolute path is
   // unknown pass just the pack file name.
   DCHECK(!path.empty());
 
-  FilePath pack_path = path;
+  base::FilePath pack_path = path;
   if (delegate_)
     pack_path = delegate_->GetPathForResourcePack(pack_path, scale_factor);