Add FilePath to base namespace.

webkit/plugins/npapi/plugin_list_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_list.h"
 
 #include <algorithm>
 
 #include "base/cpu.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
 #include "base/stringprintf.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 
 namespace webkit {
 namespace npapi {
 
 namespace {
 
 // We build up a list of files and mtimes so we can sort them.
-typedef std::pair<FilePath, base::Time> FileAndTime;
+typedef std::pair<base::FilePath, base::Time> FileAndTime;
 typedef std::vector<FileAndTime> FileTimeList;
 
 enum PluginQuirk {
   // No quirks - plugin is outright banned.
   PLUGIN_QUIRK_NONE = 0,
   // Plugin is using SSE2 instructions without checking for SSE2 instruction
   // support. Ban the plugin if the system has no SSE2 support.
   PLUGIN_QUIRK_MISSING_SSE2_CHECK = 1 << 0,
 };
 
@@ skipping 21 matching lines @@
       return true;
   }
 
   return false;
 }
 
 // Return true if |path| matches a known (file size, sha1sum) pair.
 // Also check against any PluginQuirks the bad plugin may have.
 // The use of the file size is an optimization so we don't have to read in
 // the entire file unless we have to.
-bool IsBlacklistedBySha1sumAndQuirks(const FilePath& path) {
+bool IsBlacklistedBySha1sumAndQuirks(const base::FilePath& path) {
   const struct BadEntry {
     int64 size;
     std::string sha1;
     PluginQuirk quirks;
   } bad_entries[] = {
     // Flash 9 r31 - http://crbug.com/29237
     { 7040080, "fa5803061125ca47846713b34a26a42f1f1e98bb", PLUGIN_QUIRK_NONE },
     // Flash 9 r48 - http://crbug.com/29237
     { 7040036, "0c4b3768a6d4bfba003088e4b9090d381de1af2b", PLUGIN_QUIRK_NONE },
     // Flash 11.2.202.236, 32-bit - http://crbug.com/140086
@@ skipping 39 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 // Return true if we shouldn't load a plugin at all.
 // This is an ugly hack to blacklist Adobe Acrobat due to not supporting
 // its Xt-based mainloop.
 // http://code.google.com/p/chromium/issues/detail?id=38229
-bool IsBlacklistedPlugin(const FilePath& path) {
+bool IsBlacklistedPlugin(const base::FilePath& path) {
   const char* kBlackListedPlugins[] = {
     "nppdf.so",           // Adobe PDF
   };
   std::string filename = path.BaseName().value();
   for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {
     if (filename.find(kBlackListedPlugins[i]) != std::string::npos) {
       return true;
     }
   }
   return IsBlacklistedBySha1sumAndQuirks(path);
 }
 
 }  // namespace
 
 void PluginList::PlatformInit() {
 }
 
-void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
+void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
   // See http://groups.google.com/group/chromium-dev/browse_thread/thread/7a70e5fcbac786a9
   // for discussion.
   // We first consult Chrome-specific dirs, then fall back on the logic
   // Mozilla uses.
 
   // Note: "extra" plugin dirs, including the Plugins subdirectory of
   // your Chrome config, are examined before these.  See the logic
   // related to extra_plugin_dirs in plugin_list.cc.
 
   // The Chrome binary dir + "plugins/".
-  FilePath dir;
+  base::FilePath dir;
   PathService::Get(base::DIR_EXE, &dir);
   plugin_dirs->push_back(dir.Append("plugins"));
 
   // Chrome OS only loads plugins from /opt/google/chrome/plugins.
 #if !defined(OS_CHROMEOS)
   // Mozilla code to reference:
   // http://mxr.mozilla.org/firefox/ident?i=NS_APP_PLUGINS_DIR_LIST
   // and tens of accompanying files (mxr is very helpful).
   // This code carefully matches their behavior for compat reasons.
 
   // 1) MOZ_PLUGIN_PATH env variable.
   const char* moz_plugin_path = getenv("MOZ_PLUGIN_PATH");
   if (moz_plugin_path) {
     std::vector<std::string> paths;
     base::SplitString(moz_plugin_path, ':', &paths);
     for (size_t i = 0; i < paths.size(); ++i)
-      plugin_dirs->push_back(FilePath(paths[i]));
+      plugin_dirs->push_back(base::FilePath(paths[i]));
   }
 
   // 2) NS_USER_PLUGINS_DIR: ~/.mozilla/plugins.
   // This is a de-facto standard, so even though we're not Mozilla, let's
   // look in there too.
-  FilePath home = file_util::GetHomeDir();
+  base::FilePath home = file_util::GetHomeDir();
   if (!home.empty())
     plugin_dirs->push_back(home.Append(".mozilla/plugins"));
 
   // 3) NS_SYSTEM_PLUGINS_DIR:
   // This varies across different browsers and versions, so check 'em all.
-  plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
-  plugin_dirs->push_back(FilePath("/usr/lib/mozilla/plugins"));
-  plugin_dirs->push_back(FilePath("/usr/lib/firefox/plugins"));
-  plugin_dirs->push_back(FilePath("/usr/lib/xulrunner-addons/plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib/browser-plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib/mozilla/plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib/firefox/plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib/xulrunner-addons/plugins"));
 
 #if defined(ARCH_CPU_64_BITS)
   // On my Ubuntu system, /usr/lib64 is a symlink to /usr/lib.
   // But a user reported on their Fedora system they are separate.
-  plugin_dirs->push_back(FilePath("/usr/lib64/browser-plugins"));
-  plugin_dirs->push_back(FilePath("/usr/lib64/mozilla/plugins"));
-  plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
-  plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib64/browser-plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib64/mozilla/plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib64/firefox/plugins"));
+  plugin_dirs->push_back(base::FilePath("/usr/lib64/xulrunner-addons/plugins"));
 #endif  // defined(ARCH_CPU_64_BITS)
 #endif  // !defined(OS_CHROMEOS)
 }
 
 void PluginList::GetPluginsInDir(
-    const FilePath& dir_path, std::vector<FilePath>* plugins) {
+    const base::FilePath& dir_path, std::vector<base::FilePath>* plugins) {
   // See ScanPluginsDirectory near
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginHostImpl.cpp#5052
 
   // Construct and stat a list of all filenames under consideration, for
   // later sorting by mtime.
   FileTimeList files;
   file_util::FileEnumerator enumerator(dir_path,
                                        false,  // not recursive
                                        file_util::FileEnumerator::FILES);
-  for (FilePath path = enumerator.Next(); !path.value().empty();
+  for (base::FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     // Skip over Mozilla .xpt files.
     if (path.MatchesExtension(FILE_PATH_LITERAL(".xpt")))
       continue;
 
     // Java doesn't like being loaded through a symlink, since it uses
     // its path to find dependent data files.
     // file_util::AbsolutePath calls through to realpath(), which resolves
     // symlinks.
-    FilePath orig_path = path;
+    base::FilePath orig_path = path;
     file_util::AbsolutePath(&path);
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Resolved " << orig_path.value() << " -> " << path.value();
 
     if (std::find(plugins->begin(), plugins->end(), path) != plugins->end()) {
       LOG_IF(ERROR, PluginList::DebugPluginLoading())
           << "Skipping duplicate instance of " << path.value();
       continue;
     }
 
@@ skipping 62 matching lines @@
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit