Add FilePath to base namespace.

webkit/plugins/npapi/plugin_lib_posix.cc

 // Copyright (c) 2011 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 "webkit/plugins/npapi/plugin_lib.h"
 
 #include <dlfcn.h>
 #if defined(OS_OPENBSD)
 #include <sys/exec_elf.h>
 #else
@@ skipping 24 matching lines @@
 // Copied from nsplugindefs.h instead of including the file since it has a bunch
 // of dependencies.
 enum nsPluginVariable {
   nsPluginVariable_NameString        = 1,
   nsPluginVariable_DescriptionString = 2
 };
 
 // Read the ELF header and return true if it is usable on
 // the current architecture (e.g. 32-bit ELF on 32-bit build).
 // Returns false on other errors as well.
-bool ELFMatchesCurrentArchitecture(const FilePath& filename) {
+bool ELFMatchesCurrentArchitecture(const base::FilePath& filename) {
   // First make sure we can open the file and it is in fact, a regular file.
   struct stat stat_buf;
   // Open with O_NONBLOCK so we don't block on pipes.
   int fd = open(filename.value().c_str(), O_RDONLY|O_NONBLOCK);
   if (fd < 0)
     return false;
   bool ret = (fstat(fd, &stat_buf) >= 0 && S_ISREG(stat_buf.st_mode));
   if (HANDLE_EINTR(close(fd)) < 0)
     return false;
   if (!ret)
@@ skipping 28 matching lines @@
 // for us to extract the real plugin path.
 struct __attribute__((packed)) NSPluginWrapperInfo {
   char ident[32];  // NSPluginWrapper magic identifier (includes version).
   char path[PATH_MAX];  // Path to wrapped plugin.
 };
 
 // Test a plugin for whether it's been wrapped by NSPluginWrapper, and
 // if so attempt to unwrap it.  Pass in an opened plugin handle; on
 // success, |dl| and |unwrapped_path| will be filled in with the newly
 // opened plugin.  On failure, params are left unmodified.
-void UnwrapNSPluginWrapper(void **dl, FilePath* unwrapped_path) {
+void UnwrapNSPluginWrapper(void **dl, base::FilePath* unwrapped_path) {
   NSPluginWrapperInfo* info =
       reinterpret_cast<NSPluginWrapperInfo*>(dlsym(*dl, "NPW_Plugin"));
   if (!info)
     return;  // Not a NSPW plugin.
 
   // Here we could check the NSPW ident field for the versioning
   // information, but the path field is available in all versions
   // anyway.
 
   // Grab the path to the wrapped plugin.  Just in case the structure
   // format changes, protect against the path not being null-terminated.
   char* path_end = static_cast<char*>(memchr(info->path, '\0',
                                              sizeof(info->path)));
   if (!path_end)
     path_end = info->path + sizeof(info->path);
-  FilePath path = FilePath(std::string(info->path, path_end - info->path));
+  base::FilePath path = base::FilePath(
+      std::string(info->path, path_end - info->path));
 
   if (!ELFMatchesCurrentArchitecture(path)) {
     LOG(WARNING) << path.value() << " is nspluginwrapper wrapping a "
                  << "plugin for a different architecture; it will "
                  << "work better if you instead use a native plugin.";
     return;
   }
 
   std::string error;
   void* newdl = base::LoadNativeLibrary(path, &error);
@@ skipping 11 matching lines @@
   LOG_IF(ERROR, PluginList::DebugPluginLoading())
       << "Using unwrapped version " << unwrapped_path->value()
       << " of nspluginwrapper-wrapped plugin.";
   base::UnloadNativeLibrary(*dl);
   *dl = newdl;
   *unwrapped_path = path;
 }
 
 }  // namespace
 
-bool PluginLib::ReadWebPluginInfo(const FilePath& filename,
+bool PluginLib::ReadWebPluginInfo(const base::FilePath& filename,
                                   WebPluginInfo* info) {
   // The file to reference is:
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginsDirUnix.cpp
 
   // Skip files that aren't appropriate for our architecture.
   if (!ELFMatchesCurrentArchitecture(filename)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Skipping plugin " << filename.value()
         << " because it doesn't match the current architecture.";
     return false;
@@ skipping 145 matching lines @@
       break;
     }
   }
   if (!version.empty()) {
     info->version = UTF8ToUTF16(version);
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit