Rename FilePath -> base::FilePath in various toplevel directories

chrome_frame/simple_resource_loader.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.
 
 #include "chrome_frame/simple_resource_loader.h"
 
 #include <atlbase.h>
 
 #include <algorithm>
 
@@ skipping 82 matching lines @@
       PolicySettings::GetInstance()->ApplicationLocale(),
       &language_tags);
 
   // Next, try the thread, process, user, system languages.
   GetPreferredLanguages(&language_tags);
 
   // Finally, fall-back on "en-US" (which may already be present in the vector,
   // but that's okay since we'll exit with success when the first is tried).
   language_tags.push_back(L"en-US");
 
-  FilePath locales_path;
+  base::FilePath locales_path;
 
   DetermineLocalesDirectory(&locales_path);
   if (!LoadLocalePack(language_tags, locales_path, &locale_dll_handle_,
                       &data_pack_, &language_)) {
     NOTREACHED() << "Failed loading any resource dll (even \"en-US\").";
   }
 }
 
 SimpleResourceLoader::~SimpleResourceLoader() {
   delete data_pack_;
@@ skipping 16 matching lines @@
       PushBackIfAbsent(*scan, language_tags);
     }
   }
   // Use the base i18n routines (i.e., ICU) as a last, best hope for something
   // meaningful for the user.
   PushBackWithFallbackIfAbsent(ASCIIToWide(base::i18n::GetConfiguredLocale()),
                                language_tags);
 }
 
 // static
-void SimpleResourceLoader::DetermineLocalesDirectory(FilePath* locales_path) {
+void SimpleResourceLoader::DetermineLocalesDirectory(
+    base::FilePath* locales_path) {
   DCHECK(locales_path);
 
-  FilePath module_path;
+  base::FilePath module_path;
   PathService::Get(base::DIR_MODULE, &module_path);
   *locales_path = module_path.Append(kLocalesDirName);
 
   // We may be residing in the "locales" directory's parent, or we might be
   // in a sibling directory. Move up one and look for Locales again in the
   // latter case.
   if (!file_util::DirectoryExists(*locales_path)) {
     *locales_path = module_path.DirName();
     *locales_path = locales_path->Append(kLocalesDirName);
   }
@@ skipping 10 matching lines @@
   // character that isn't in the above set.  This will at least weed out
   // attempts at "../../EvilBinary".
   return language_tag.end() == std::find_if(language_tag.begin(),
                                             language_tag.end(),
                                             &IsInvalidTagCharacter);
 }
 
 // static
 bool SimpleResourceLoader::LoadLocalePack(
     const std::vector<std::wstring>& language_tags,
-    const FilePath& locales_path,
+    const base::FilePath& locales_path,
     HMODULE* dll_handle,
     ui::DataPack** data_pack,
     std::wstring* language) {
   DCHECK(language);
 
   // The dll should only have resources, not executable code.
   const DWORD load_flags =
       (base::win::GetVersion() >= base::win::VERSION_VISTA ?
           LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE :
           DONT_RESOLVE_DLL_REFERENCES);
 
   const std::wstring dll_suffix(L".dll");
   const std::wstring pack_suffix(L".pak");
 
   bool found_pack = false;
 
   for (std::vector<std::wstring>::const_iterator scan = language_tags.begin(),
          end = language_tags.end();
        scan != end;
        ++scan) {
     if (!IsValidLanguageTag(*scan)) {
       LOG(WARNING) << "Invalid language tag supplied while locating resources:"
                       " \"" << *scan << "\"";
       continue;
     }
 
     // Attempt to load both the resource pack and the dll. We return success
     // only we load both.
-    FilePath resource_pack_path = locales_path.Append(*scan + pack_suffix);
-    FilePath dll_path = locales_path.Append(*scan + dll_suffix);
+    base::FilePath resource_pack_path =
+        locales_path.Append(*scan + pack_suffix);
+    base::FilePath dll_path = locales_path.Append(*scan + dll_suffix);
 
     if (file_util::PathExists(resource_pack_path) &&
         file_util::PathExists(dll_path)) {
       scoped_ptr<ui::DataPack> cur_data_pack(
           new ui::DataPack(ui::SCALE_FACTOR_100P));
       if (!cur_data_pack->LoadFromPath(resource_pack_path))
         continue;
 
       HMODULE locale_dll_handle = LoadLibraryEx(dll_path.value().c_str(), NULL,
                                                 load_flags);
@@ skipping 45 matching lines @@
 
 // static
 std::wstring SimpleResourceLoader::Get(int message_id) {
   SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance();
   return loader->GetLocalizedResource(message_id);
 }
 
 HMODULE SimpleResourceLoader::GetResourceModuleHandle() {
   return locale_dll_handle_;
 }