Index: webkit/plugins/npapi/plugin_lib_posix.cc |
diff --git a/webkit/plugins/npapi/plugin_lib_posix.cc b/webkit/plugins/npapi/plugin_lib_posix.cc |
index cc3ed52c67cd54e66604c3a390d02b1c0cf270a4..144b133c09cad05494b52c0fbedd366a5aa78fbc 100644 |
--- a/webkit/plugins/npapi/plugin_lib_posix.cc |
+++ b/webkit/plugins/npapi/plugin_lib_posix.cc |
@@ -42,7 +42,7 @@ enum nsPluginVariable { |
// 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. |
@@ -91,7 +91,7 @@ struct __attribute__((packed)) NSPluginWrapperInfo { |
// 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) |
@@ -107,7 +107,8 @@ void UnwrapNSPluginWrapper(void **dl, FilePath* unwrapped_path) { |
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 " |
@@ -139,7 +140,7 @@ void UnwrapNSPluginWrapper(void **dl, FilePath* unwrapped_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 |