Replace all FilePath with base::FilePath in content.

This is im preparation for removing the 'using" in file_path.h

Review URL: https://codereview.chromium.org/12226120

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182940 0039d316-1c4b-4281-b951-d872f2087c98

53 files changed, 166 insertions, 154 deletions

diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
index 2a6a381..da56188 100644
--- a/content/browser/child_process_security_policy_unittest.cc
+++ b/content/browser/child_process_security_policy_unittest.cc
@@ -354,20 +354,22 @@ TEST_F(ChildProcessSecurityPolicyTest, CanReadDirectories) {
 }
 
 TEST_F(ChildProcessSecurityPolicyTest, FilePermissions) {
-  base::FilePath granted_file = FilePath(TEST_PATH("/home/joe"));
-  base::FilePath sibling_file = FilePath(TEST_PATH("/home/bob"));
-  base::FilePath child_file = FilePath(TEST_PATH("/home/joe/file"));
-  base::FilePath parent_file = FilePath(TEST_PATH("/home"));
-  base::FilePath parent_slash_file = FilePath(TEST_PATH("/home/"));
-  base::FilePath child_traversal1 = FilePath(TEST_PATH("/home/joe/././file"));
-  base::FilePath child_traversal2 = FilePath(
+  base::FilePath granted_file = base::FilePath(TEST_PATH("/home/joe"));
+  base::FilePath sibling_file = base::FilePath(TEST_PATH("/home/bob"));
+  base::FilePath child_file = base::FilePath(TEST_PATH("/home/joe/file"));
+  base::FilePath parent_file = base::FilePath(TEST_PATH("/home"));
+  base::FilePath parent_slash_file = base::FilePath(TEST_PATH("/home/"));
+  base::FilePath child_traversal1 =
+      base::FilePath(TEST_PATH("/home/joe/././file"));
+  base::FilePath child_traversal2 = base::FilePath(
       TEST_PATH("/home/joe/file/../otherfile"));
   base::FilePath evil_traversal1 =
       FilePath(TEST_PATH("/home/joe/../../etc/passwd"));
-  base::FilePath evil_traversal2 = FilePath(
+  base::FilePath evil_traversal2 = base::FilePath(
       TEST_PATH("/home/joe/./.././../etc/passwd"));
-  base::FilePath self_traversal = FilePath(TEST_PATH("/home/joe/../joe/file"));
-  base::FilePath relative_file = FilePath(FILE_PATH_LITERAL("home/joe"));
+  base::FilePath self_traversal =
+      base::FilePath(TEST_PATH("/home/joe/../joe/file"));
+  base::FilePath relative_file = base::FilePath(FILE_PATH_LITERAL("home/joe"));
 
   ChildProcessSecurityPolicyImpl* p =
       ChildProcessSecurityPolicyImpl::GetInstance();
diff --git a/content/browser/download/file_metadata_mac.mm b/content/browser/download/file_metadata_mac.mm
index d16edf2..0a45cdb 100644
--- a/content/browser/download/file_metadata_mac.mm
+++ b/content/browser/download/file_metadata_mac.mm
@@ -96,7 +96,7 @@ void AddOriginMetadataToFile(const base::FilePath& file, const GURL& source,
 // LSFileQuarantineEnabled entry in our Info.plist, but it knows relatively
 // little about the files. We add more information about the download to
 // improve the UI shown by the OS when the users tries to open the file.
-void AddQuarantineMetadataToFile(const FilePath& file, const GURL& source,
+void AddQuarantineMetadataToFile(const base::FilePath& file, const GURL& source,
                                  const GURL& referrer) {
   FSRef file_ref;
   if (!base::mac::FSRefFromPath(file.value(), &file_ref))
diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h
index 3845528..7863680 100644
--- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h
@@ -70,7 +70,7 @@ class PepperFlashFileMessageFilter : public ppapi::host::ResourceMessageFilter {
       const ppapi::PepperFilePath& pepper_path,
       int flags);
 
-  FilePath plugin_data_directory_;
+  base::FilePath plugin_data_directory_;
   int render_process_id_;
   base::ProcessHandle plugin_process_handle_;
 
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 2b16e49..98e0364 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -54,7 +54,7 @@ net::URLRequestContextGetter* ContentBrowserClient::CreateRequestContext(
 net::URLRequestContextGetter*
 ContentBrowserClient::CreateRequestContextForStoragePartition(
     BrowserContext* browser_context,
-    const FilePath& partition_path,
+    const base::FilePath& partition_path,
     bool in_memory,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
@@ -246,8 +246,8 @@ bool ContentBrowserClient::IsFastShutdownPossible() {
   return true;
 }
 
-FilePath ContentBrowserClient::GetDefaultDownloadDirectory() {
-  return FilePath();
+base::FilePath ContentBrowserClient::GetDefaultDownloadDirectory() {
+  return base::FilePath();
 }
 
 std::string ContentBrowserClient::GetDefaultDownloadName() {
@@ -266,8 +266,8 @@ bool ContentBrowserClient::AllowPepperSocketAPI(
   return false;
 }
 
-FilePath ContentBrowserClient::GetHyphenDictionaryDirectory() {
-  return FilePath();
+base::FilePath ContentBrowserClient::GetHyphenDictionaryDirectory() {
+  return base::FilePath();
 }
 
 ui::SelectFilePolicy* ContentBrowserClient::CreateSelectFilePolicy(
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 0e1ed14..273593a 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -159,7 +159,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   // TODO(ajwong): Remove once http://crbug.com/159193 is resolved.
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       BrowserContext* browser_context,
-      const FilePath& partition_path,
+      const base::FilePath& partition_path,
       bool in_memory,
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
           blob_protocol_handler,
@@ -461,7 +461,7 @@ class CONTENT_EXPORT ContentBrowserClient {
 
   // Returns the default download directory.
   // This can be called on any thread.
-  virtual FilePath GetDefaultDownloadDirectory();
+  virtual base::FilePath GetDefaultDownloadDirectory();
 
   // Returns the default filename used in downloads when we have no idea what
   // else we should do with the file.
@@ -483,7 +483,7 @@ class CONTENT_EXPORT ContentBrowserClient {
                                     const SocketPermissionRequest& params);
 
   // Returns the directory containing hyphenation dictionaries.
-  virtual FilePath GetHyphenDictionaryDirectory();
+  virtual base::FilePath GetHyphenDictionaryDirectory();
 
   // Returns an implementation of a file selecition policy. Can return NULL.
   virtual ui::SelectFilePolicy* CreateSelectFilePolicy(
diff --git a/content/public/browser/devtools_http_handler_delegate.h b/content/public/browser/devtools_http_handler_delegate.h
index efc8cb9..2e3d2e2 100644
--- a/content/public/browser/devtools_http_handler_delegate.h
+++ b/content/public/browser/devtools_http_handler_delegate.h
@@ -33,7 +33,7 @@ class DevToolsHttpHandlerDelegate {
   virtual bool BundlesFrontendResources() = 0;
 
   // Returns path to the front-end files on the local filesystem for debugging.
-  virtual FilePath GetDebugFrontendDir() = 0;
+  virtual base::FilePath GetDebugFrontendDir() = 0;
 
   // Get a thumbnail for a given page. Returns non-empty string iff we have the
   // thumbnail.
diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h
index 3e29c07..e3e8d32 100644
--- a/content/public/browser/download_item.h
+++ b/content/public/browser/download_item.h
@@ -201,27 +201,27 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData {
   // physical file, if one exists. It should be considered a hint; changes to
   // this value and renames of the file on disk are not atomic with each other.
   // May be empty if the in-progress path hasn't been determined yet.
-  virtual const FilePath& GetFullPath() const = 0;
+  virtual const base::FilePath& GetFullPath() const = 0;
 
   // Target path of an in-progress download. We may be downloading to a
   // temporary or intermediate file (specified by GetFullPath()); this is the
   // name we will use once the download completes.
   // May be empty if the target path hasn't yet been determined.
-  virtual const FilePath& GetTargetFilePath() const = 0;
+  virtual const base::FilePath& GetTargetFilePath() const = 0;
 
   // If the download forced a path rather than requesting name determination,
   // return the path requested.
-  virtual const FilePath& GetForcedFilePath() const = 0;
+  virtual const base::FilePath& GetForcedFilePath() const = 0;
 
   // Returns the user-verified target file path for the download.
   // This returns the same path as GetTargetFilePath() for safe downloads
   // but does not for dangerous downloads until the name is verified.
-  virtual FilePath GetUserVerifiedFilePath() const = 0;
+  virtual base::FilePath GetUserVerifiedFilePath() const = 0;
 
   // Returns the file-name that should be reported to the user. If a display
   // name has been explicitly set using SetDisplayName(), this function returns
   // that display name. Otherwise returns the final target filename.
-  virtual FilePath GetFileNameToReportUser() const = 0;
+  virtual base::FilePath GetFileNameToReportUser() const = 0;
 
   virtual TargetDisposition GetTargetDisposition() const = 0;
 
@@ -314,7 +314,7 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData {
   // Set a display name for the download that will be independent of the target
   // filename. If |name| is not empty, then GetFileNameToReportUser() will
   // return |name|. Has no effect on the final target filename.
-  virtual void SetDisplayName(const FilePath& name) = 0;
+  virtual void SetDisplayName(const base::FilePath& name) = 0;
 
   // Debug/testing -------------------------------------------------------------
   virtual std::string DebugString(bool verbose) const = 0;
diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h
index 435e979..d834ab1 100644
--- a/content/public/browser/download_manager.h
+++ b/content/public/browser/download_manager.h
@@ -144,8 +144,8 @@ class CONTENT_EXPORT DownloadManager
   // Called by the embedder, after creating the download manager, to let it know
   // about downloads from previous runs of the browser.
   virtual DownloadItem* CreateDownloadItem(
-      const FilePath& current_path,
-      const FilePath& target_path,
+      const base::FilePath& current_path,
+      const base::FilePath& target_path,
       const std::vector<GURL>& url_chain,
       const GURL& referrer_url,
       const base::Time& start_time,
diff --git a/content/public/browser/download_manager_delegate.cc b/content/public/browser/download_manager_delegate.cc
index 8826b97..7a1b1f9 100644
--- a/content/public/browser/download_manager_delegate.cc
+++ b/content/public/browser/download_manager_delegate.cc
@@ -25,7 +25,7 @@ WebContents* DownloadManagerDelegate::
 }
 
 bool DownloadManagerDelegate::ShouldOpenFileBasedOnExtension(
-    const FilePath& path) {
+    const base::FilePath& path) {
   return false;
 }
 
diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h
index 8760321..8b41161 100644
--- a/content/public/browser/download_manager_delegate.h
+++ b/content/public/browser/download_manager_delegate.h
@@ -29,7 +29,7 @@ typedef base::Callback<void(DownloadItem*)>
 // operation.  If the delegate wants notification of the download item created
 // in response to this operation, the SavePackageDownloadCreatedCallback will be
 // non-null.
-typedef base::Callback<void(const FilePath&,
+typedef base::Callback<void(const base::FilePath&,
                             SavePageType,
                             const SavePackageDownloadCreatedCallback&)>
     SavePackagePathPickedCallback;
@@ -41,10 +41,10 @@ typedef base::Callback<void(const FilePath&,
 // same as |target_path|). Both |target_path| and |intermediate_path| are
 // expected to in the same directory.
 typedef base::Callback<void(
-    const FilePath& target_path,
+    const base::FilePath& target_path,
     DownloadItem::TargetDisposition disposition,
     DownloadDangerType danger_type,
-    const FilePath& intermediate_path)> DownloadTargetCallback;
+    const base::FilePath& intermediate_path)> DownloadTargetCallback;
 
 // Called when a download delayed by the delegate has completed.
 typedef base::Callback<void(bool)> DownloadOpenDelayedCallback;
@@ -83,7 +83,7 @@ class CONTENT_EXPORT DownloadManagerDelegate {
   virtual WebContents* GetAlternativeWebContentsToNotifyForDownload();
 
   // Tests if a file type should be opened automatically.
-  virtual bool ShouldOpenFileBasedOnExtension(const FilePath& path);
+  virtual bool ShouldOpenFileBasedOnExtension(const base::FilePath& path);
 
   // Allows the delegate to delay completion of the download.  This function
   // will either return true (in which case the download may complete)
@@ -107,17 +107,18 @@ class CONTENT_EXPORT DownloadManagerDelegate {
 
   // Retrieve the directories to save html pages and downloads to.
   virtual void GetSaveDir(BrowserContext* browser_context,
-                          FilePath* website_save_dir,
-                          FilePath* download_save_dir,
+                          base::FilePath* website_save_dir,
+                          base::FilePath* download_save_dir,
                           bool* skip_dir_check) {}
 
   // Asks the user for the path to save a page. The delegate calls the callback
   // to give the answer.
-  virtual void ChooseSavePath(WebContents* web_contents,
-                              const FilePath& suggested_path,
-                              const FilePath::StringType& default_extension,
-                              bool can_save_as_complete,
-                              const SavePackagePathPickedCallback& callback) {
+  virtual void ChooseSavePath(
+      WebContents* web_contents,
+      const base::FilePath& suggested_path,
+      const base::FilePath::StringType& default_extension,
+      bool can_save_as_complete,
+      const SavePackagePathPickedCallback& callback) {
   }
 
   // Opens the file associated with this download.
diff --git a/content/public/browser/download_save_info.h b/content/public/browser/download_save_info.h
index cfa7c01..24ad355 100644
--- a/content/public/browser/download_save_info.h
+++ b/content/public/browser/download_save_info.h
@@ -23,7 +23,7 @@ struct CONTENT_EXPORT DownloadSaveInfo {
   // If non-empty, contains the full target path of the download that has been
   // determined prior to download initiation. This is considered to be a trusted
   // path.
-  FilePath file_path;
+  base::FilePath file_path;
 
   // If non-empty, contains an untrusted filename suggestion. This can't contain
   // a path (only a filename), and is only effective if |file_path| is empty.
diff --git a/content/public/browser/download_url_parameters.h b/content/public/browser/download_url_parameters.h
index a8e3258..e8b10eae 100644
--- a/content/public/browser/download_url_parameters.h
+++ b/content/public/browser/download_url_parameters.h
@@ -86,7 +86,7 @@ class CONTENT_EXPORT DownloadUrlParameters {
   void set_callback(const OnStartedCallback& callback) {
     callback_ = callback;
   }
-  void set_file_path(const FilePath& file_path) {
+  void set_file_path(const base::FilePath& file_path) {
     save_info_.file_path = file_path;
   }
   void set_suggested_name(const string16& suggested_name) {
@@ -128,7 +128,7 @@ class CONTENT_EXPORT DownloadUrlParameters {
   ResourceDispatcherHost* resource_dispatcher_host() const {
     return resource_dispatcher_host_;
   }
-  const FilePath& file_path() const { return save_info_.file_path; }
+  const base::FilePath& file_path() const { return save_info_.file_path; }
   const string16& suggested_name() const { return save_info_.suggested_name; }
   int64 offset() const { return save_info_.offset; }
   const std::string& hash_state() const { return save_info_.hash_state; }
diff --git a/content/public/browser/indexed_db_context.h b/content/public/browser/indexed_db_context.h
index 01ce269..9d87444f 100644
--- a/content/public/browser/indexed_db_context.h
+++ b/content/public/browser/indexed_db_context.h
@@ -32,7 +32,8 @@ class IndexedDBContext : public base::RefCountedThreadSafe<IndexedDBContext> {
   virtual void DeleteForOrigin(const GURL& origin_url) = 0;
 
   // Get the file name of the local storage file for the given origin.
-  virtual FilePath GetFilePathForTesting(const string16& origin_id) const = 0;
+  virtual base::FilePath GetFilePathForTesting(
+      const string16& origin_id) const = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<IndexedDBContext>;
diff --git a/content/public/browser/plugin_service_filter.h b/content/public/browser/plugin_service_filter.h
index f0b8bbc..e151ef9 100644
--- a/content/public/browser/plugin_service_filter.h
+++ b/content/public/browser/plugin_service_filter.h
@@ -31,7 +31,7 @@ class PluginServiceFilter {
 
   // Whether the renderer has permission to load available |plugin|.
   virtual bool CanLoadPlugin(int render_process_id,
-                             const FilePath& path) = 0;
+                             const base::FilePath& path) = 0;
 };
 
 }  // namespace content
diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h
index 2a905d9..a0427fb 100644
--- a/content/public/browser/storage_partition.h
+++ b/content/public/browser/storage_partition.h
@@ -46,7 +46,7 @@ class DOMStorageContext;
 // the cookies, localStorage, etc., that normal web renderers have access to.
 class StoragePartition {
  public:
-  virtual FilePath GetPath() = 0;
+  virtual base::FilePath GetPath() = 0;
   virtual net::URLRequestContextGetter* GetURLRequestContext() = 0;
   virtual net::URLRequestContextGetter* GetMediaURLRequestContext() = 0;
   virtual quota::QuotaManager* GetQuotaManager() = 0;
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 819e628..1a26c89 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -314,15 +314,16 @@ class WebContents : public PageNavigator,
   // Save page with the main HTML file path, the directory for saving resources,
   // and the save type: HTML only or complete web page. Returns true if the
   // saving process has been initiated successfully.
-  virtual bool SavePage(const FilePath& main_file,
-                        const FilePath& dir_path,
+  virtual bool SavePage(const base::FilePath& main_file,
+                        const base::FilePath& dir_path,
                         SavePageType save_type) = 0;
 
   // Generate an MHTML representation of the current page in the given file.
   virtual void GenerateMHTML(
-      const FilePath& file,
-      const base::Callback<void(const FilePath& /* path to the MHTML file */,
-                                int64 /* size of the file */)>& callback) = 0;
+      const base::FilePath& file,
+      const base::Callback<void(
+          const base::FilePath& /* path to the MHTML file */,
+          int64 /* size of the file */)>& callback) = 0;
 
   // Returns true if the active NavigationEntry's page_id equals page_id.
   virtual bool IsActiveEntry(int32 page_id) = 0;
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index d236634..7a4409d 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -142,7 +142,7 @@ content::ColorChooser* WebContentsDelegate::OpenColorChooser(
 bool WebContentsDelegate::RequestPpapiBrokerPermission(
     WebContents* web_contents,
     const GURL& url,
-    const FilePath& plugin_path,
+    const base::FilePath& plugin_path,
     const base::Callback<void(bool)>& callback) {
   return false;
 }
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index f58f57d..a66e428 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -209,7 +209,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
   // this ID is supplied by the renderer, so should not be trusted. Besides, the
   // corresponding process has probably died at this point. The ID may even have
   // been reused by a new process.
-  virtual void PluginCrashed(const FilePath& plugin_path,
+  virtual void PluginCrashed(const base::FilePath& plugin_path,
                              base::ProcessId plugin_pid) {}
 
   // Notication that the given plugin has hung or become unhung. This
@@ -219,7 +219,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
   // that this ID is supplied by the renderer, so should be validated before
   // it's used for anything in case there's an exploited renderer.
   virtual void PluginHungStatusChanged(int plugin_child_id,
-                                       const FilePath& plugin_path,
+                                       const base::FilePath& plugin_path,
                                        bool is_hung) {}
 
   // Invoked when WebContents::Clone() was used to clone a WebContents.
diff --git a/content/public/common/content_constants.cc b/content/public/common/content_constants.cc
index 748888f..55b244e 100644
--- a/content/public/common/content_constants.cc
+++ b/content/public/common/content_constants.cc
@@ -5,9 +5,9 @@
 #include "content/public/common/content_constants.h"
 namespace content {
 
-const FilePath::CharType kAppCacheDirname[] =
+const base::FilePath::CharType kAppCacheDirname[] =
     FILE_PATH_LITERAL("Application Cache");
-const FilePath::CharType kPepperDataDirname[] =
+const base::FilePath::CharType kPepperDataDirname[] =
     FILE_PATH_LITERAL("Pepper Data");
 
 const char kBrowserPluginMimeType[] = "application/browser-plugin";
diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h
index 9097181..3f5af15 100644
--- a/content/public/common/content_constants.h
+++ b/content/public/common/content_constants.h
@@ -16,10 +16,10 @@ namespace content {
 
 // The name of the directory under BrowserContext::GetPath where the AppCache is
 // put.
-CONTENT_EXPORT extern const FilePath::CharType kAppCacheDirname[];
+CONTENT_EXPORT extern const base::FilePath::CharType kAppCacheDirname[];
 // The name of the directory under BrowserContext::GetPath where Pepper plugin
 // data is put.
-CONTENT_EXPORT extern const FilePath::CharType kPepperDataDirname[];
+CONTENT_EXPORT extern const base::FilePath::CharType kPepperDataDirname[];
 
 // The MIME type used for the browser plugin.
 CONTENT_EXPORT extern const char kBrowserPluginMimeType[];
diff --git a/content/public/common/file_chooser_params.h b/content/public/common/file_chooser_params.h
index fad4702..32261d1 100644
--- a/content/public/common/file_chooser_params.h
+++ b/content/public/common/file_chooser_params.h
@@ -40,7 +40,7 @@ struct CONTENT_EXPORT FileChooserParams {
   string16 title;
 
   // Default file name to select in the dialog.
-  FilePath default_file_name;
+  base::FilePath default_file_name;
 
   // A list of valid lower-cased MIME types or file extensions specified in an
   // input element. It is used to restrict selectable files to such types.
diff --git a/content/public/common/pepper_plugin_info.h b/content/public/common/pepper_plugin_info.h
index 207295d..057b0469 100644
--- a/content/public/common/pepper_plugin_info.h
+++ b/content/public/common/pepper_plugin_info.h
@@ -34,7 +34,7 @@ struct CONTENT_EXPORT PepperPluginInfo {
   // Defaults to true.
   bool is_sandboxed;
 
-  FilePath path;  // Internal plugins have "internal-[name]" as path.
+  base::FilePath path;  // Internal plugins have "internal-[name]" as path.
   std::string name;
   std::string description;
   std::string version;
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index d0b83cd..04d6ff0 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -112,7 +112,7 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
   RunTestOnMainThreadLoop();
 }
 
-void BrowserTestBase::CreateTestServer(const FilePath& test_server_base) {
+void BrowserTestBase::CreateTestServer(const base::FilePath& test_server_base) {
   CHECK(!test_server_.get());
   test_server_.reset(new net::TestServer(
       net::TestServer::TYPE_HTTP,
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 69d0b98cd..8b8b6ba 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -192,7 +192,7 @@ void SetCookieOnIOThread(const GURL& url,
 }  // namespace
 
 
-GURL GetFileUrlWithQuery(const FilePath& path,
+GURL GetFileUrlWithQuery(const base::FilePath& path,
                          const std::string& query_string) {
   GURL url = net::FilePathToFileURL(path);
   if (!query_string.empty()) {
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 5ae5644..b75782c 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -50,7 +50,8 @@ class RenderViewHost;
 class WebContents;
 
 // Generate a URL for a file path including a query string.
-GURL GetFileUrlWithQuery(const FilePath& path, const std::string& query_string);
+GURL GetFileUrlWithQuery(const base::FilePath& path,
+                         const std::string& query_string);
 
 // Waits for a load stop for the specified |web_contents|'s controller, if the
 // tab is currently web_contents.  Otherwise returns immediately.
diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h
index 08f4dc3..fc75efc 100644
--- a/content/public/test/mock_download_item.h
+++ b/content/public/test/mock_download_item.h
@@ -57,11 +57,11 @@ class MockDownloadItem : public DownloadItem {
   MOCK_CONST_METHOD0(GetLastModifiedTime, const std::string&());
   MOCK_CONST_METHOD0(GetETag, const std::string&());
   MOCK_CONST_METHOD0(IsSavePackageDownload, bool());
-  MOCK_CONST_METHOD0(GetFullPath, const FilePath&());
-  MOCK_CONST_METHOD0(GetTargetFilePath, const FilePath&());
-  MOCK_CONST_METHOD0(GetForcedFilePath, const FilePath&());
-  MOCK_CONST_METHOD0(GetUserVerifiedFilePath, FilePath());
-  MOCK_CONST_METHOD0(GetFileNameToReportUser, FilePath());
+  MOCK_CONST_METHOD0(GetFullPath, const base::FilePath&());
+  MOCK_CONST_METHOD0(GetTargetFilePath, const base::FilePath&());
+  MOCK_CONST_METHOD0(GetForcedFilePath, const base::FilePath&());
+  MOCK_CONST_METHOD0(GetUserVerifiedFilePath, base::FilePath());
+  MOCK_CONST_METHOD0(GetFileNameToReportUser, base::FilePath());
   MOCK_CONST_METHOD0(GetTargetDisposition, TargetDisposition());
   MOCK_CONST_METHOD0(GetHash, const std::string&());
   MOCK_CONST_METHOD0(GetHashState, const std::string&());
@@ -88,7 +88,7 @@ class MockDownloadItem : public DownloadItem {
   MOCK_METHOD1(SetOpenWhenComplete, void(bool));
   MOCK_METHOD1(SetIsTemporary, void(bool));
   MOCK_METHOD1(SetOpened, void(bool));
-  MOCK_METHOD1(SetDisplayName, void(const FilePath&));
+  MOCK_METHOD1(SetDisplayName, void(const base::FilePath&));
   MOCK_CONST_METHOD1(DebugString, std::string(bool));
 };
 
diff --git a/content/public/test/mock_download_manager.cc b/content/public/test/mock_download_manager.cc
index a3b9615..143ff24 100644
--- a/content/public/test/mock_download_manager.cc
+++ b/content/public/test/mock_download_manager.cc
@@ -10,8 +10,8 @@
 namespace content {
 
 MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter(
-    const FilePath& current_path,
-    const FilePath& target_path,
+    const base::FilePath& current_path,
+    const base::FilePath& target_path,
     const std::vector<GURL>& url_chain,
     const GURL& referrer_url,
     const base::Time& start_time,
@@ -79,8 +79,8 @@ DownloadItem* MockDownloadManager::StartDownload(
 }
 
 DownloadItem* MockDownloadManager::CreateDownloadItem(
-    const FilePath& current_path,
-    const FilePath& target_path,
+    const base::FilePath& current_path,
+    const base::FilePath& target_path,
     const std::vector<GURL>& url_chain,
     const GURL& referrer_url,
     const base::Time& start_time,
diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h
index 04cac3f..1dbbbca 100644
--- a/content/public/test/mock_download_manager.h
+++ b/content/public/test/mock_download_manager.h
@@ -26,8 +26,8 @@ class MockDownloadManager : public DownloadManager {
   // Structure to make it possible to match more than 10 arguments on
   // CreateDownloadItem.
   struct CreateDownloadItemAdapter {
-    FilePath current_path;
-    FilePath target_path;
+    base::FilePath current_path;
+    base::FilePath target_path;
     std::vector<GURL> url_chain;
     GURL referrer_url;
     base::Time start_time;
@@ -40,8 +40,8 @@ class MockDownloadManager : public DownloadManager {
     bool opened;
 
     CreateDownloadItemAdapter(
-      const FilePath& current_path,
-      const FilePath& target_path,
+      const base::FilePath& current_path,
+      const base::FilePath& target_path,
       const std::vector<GURL>& url_chain,
       const GURL& referrer_url,
       const base::Time& start_time,
@@ -89,8 +89,8 @@ class MockDownloadManager : public DownloadManager {
 
   // Redirects to mock method to get around gmock 10 argument limit.
   virtual DownloadItem* CreateDownloadItem(
-      const FilePath& current_path,
-      const FilePath& target_path,
+      const base::FilePath& current_path,
+      const base::FilePath& target_path,
       const std::vector<GURL>& url_chain,
       const GURL& referrer_url,
       const base::Time& start_time,
diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc
index 1b805c3..564768b 100644
--- a/content/public/test/render_widget_test.cc
+++ b/content/public/test/render_widget_test.cc
@@ -131,7 +131,7 @@ bool RenderWidgetTest::ImageContainsColor(const SkBitmap& bitmap,
 }
 
 void RenderWidgetTest::OutputBitmapToFile(const SkBitmap& bitmap,
-                                          const FilePath& file_path) {
+                                          const base::FilePath& file_path) {
   scoped_refptr<base::RefCountedBytes> bitmap_data(new base::RefCountedBytes());
   SkAutoLockPixels lock(bitmap);
   ASSERT_TRUE(gfx::JPEGCodec::Encode(
diff --git a/content/public/test/render_widget_test.h b/content/public/test/render_widget_test.h
index 7b471923..d163ea1 100644
--- a/content/public/test/render_widget_test.h
+++ b/content/public/test/render_widget_test.h
@@ -52,7 +52,8 @@ class RenderWidgetTest : public RenderViewTest {
   // file_util::CreateTemporaryFile(&tmp_path);
   // OutputBitmapToFile(bitmap, tmp_path);
   // LOG(INFO) << "Bitmap image stored at: " << tmp_path.value();
-  void OutputBitmapToFile(const SkBitmap& bitmap, const FilePath& file_path);
+  void OutputBitmapToFile(const SkBitmap& bitmap,
+                          const base::FilePath& file_path);
 };
 
 }  // namespace content
diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc
index b954c70..7dc1c84 100644
--- a/content/public/test/test_browser_context.cc
+++ b/content/public/test/test_browser_context.cc
@@ -48,7 +48,7 @@ TestBrowserContext::TestBrowserContext() {
 TestBrowserContext::~TestBrowserContext() {
 }
 
-FilePath TestBrowserContext::TakePath() {
+base::FilePath TestBrowserContext::TakePath() {
   return browser_context_dir_.Take();
 }
 
@@ -57,7 +57,7 @@ void TestBrowserContext::SetSpecialStoragePolicy(
   special_storage_policy_ = policy;
 }
 
-FilePath TestBrowserContext::GetPath() {
+base::FilePath TestBrowserContext::GetPath() {
   return browser_context_dir_.path();
 }
 
@@ -94,7 +94,7 @@ TestBrowserContext::GetMediaRequestContextForRenderProcess(
 
 net::URLRequestContextGetter*
 TestBrowserContext::GetMediaRequestContextForStoragePartition(
-    const FilePath& partition_path,
+    const base::FilePath& partition_path,
     bool in_memory) {
   return NULL;
 }
diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h
index 41ddfdd..120fd01 100644
--- a/content/public/test/test_browser_context.h
+++ b/content/public/test/test_browser_context.h
@@ -23,11 +23,11 @@ class TestBrowserContext : public BrowserContext {
 
   // Takes ownership of the temporary directory so that it's not deleted when
   // this object is destructed.
-  FilePath TakePath();
+  base::FilePath TakePath();
 
   void SetSpecialStoragePolicy(quota::SpecialStoragePolicy* policy);
 
-  virtual FilePath GetPath() OVERRIDE;
+  virtual base::FilePath GetPath() OVERRIDE;
   virtual bool IsOffTheRecord() const OVERRIDE;
   virtual DownloadManagerDelegate* GetDownloadManagerDelegate() OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
@@ -38,7 +38,7 @@ class TestBrowserContext : public BrowserContext {
       int renderer_child_id) OVERRIDE;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
-          const FilePath& partition_path,
+          const base::FilePath& partition_path,
           bool in_memory) OVERRIDE;
   virtual ResourceContext* GetResourceContext() OVERRIDE;
   virtual GeolocationPermissionContext*
diff --git a/content/public/test/test_file_error_injector.cc b/content/public/test/test_file_error_injector.cc
index 2a0c690..584b41056 100644
--- a/content/public/test/test_file_error_injector.cc
+++ b/content/public/test/test_file_error_injector.cc
@@ -30,7 +30,7 @@ class DownloadFileWithErrors: public DownloadFileImpl {
 
   DownloadFileWithErrors(
       scoped_ptr<DownloadSaveInfo> save_info,
-      const FilePath& default_download_directory,
+      const base::FilePath& default_download_directory,
       const GURL& url,
       const GURL& referrer_url,
       bool calculate_hash,
@@ -50,10 +50,10 @@ class DownloadFileWithErrors: public DownloadFileImpl {
   virtual DownloadInterruptReason AppendDataToFile(
       const char* data, size_t data_len) OVERRIDE;
   virtual void RenameAndUniquify(
-      const FilePath& full_path,
+      const base::FilePath& full_path,
       const RenameCompletionCallback& callback) OVERRIDE;
   virtual void RenameAndAnnotate(
-      const FilePath& full_path,
+      const base::FilePath& full_path,
       const RenameCompletionCallback& callback) OVERRIDE;
 
  private:
@@ -96,16 +96,16 @@ static void RenameErrorCallback(
     const DownloadFile::RenameCompletionCallback original_callback,
     DownloadInterruptReason overwrite_error,
     DownloadInterruptReason original_error,
-    const FilePath& path_result) {
+    const base::FilePath& path_result) {
   original_callback.Run(
       overwrite_error,
       overwrite_error == DOWNLOAD_INTERRUPT_REASON_NONE ?
-      path_result : FilePath());
+      path_result : base::FilePath());
 }
 
 DownloadFileWithErrors::DownloadFileWithErrors(
     scoped_ptr<DownloadSaveInfo> save_info,
-    const FilePath& default_download_directory,
+    const base::FilePath& default_download_directory,
     const GURL& url,
     const GURL& referrer_url,
     bool calculate_hash,
@@ -154,7 +154,7 @@ DownloadInterruptReason DownloadFileWithErrors::AppendDataToFile(
 }
 
 void DownloadFileWithErrors::RenameAndUniquify(
-    const FilePath& full_path,
+    const base::FilePath& full_path,
     const RenameCompletionCallback& callback) {
   DownloadInterruptReason error_to_return = DOWNLOAD_INTERRUPT_REASON_NONE;
   RenameCompletionCallback callback_to_use = callback;
@@ -171,7 +171,7 @@ void DownloadFileWithErrors::RenameAndUniquify(
 }
 
 void DownloadFileWithErrors::RenameAndAnnotate(
-    const FilePath& full_path,
+    const base::FilePath& full_path,
     const RenameCompletionCallback& callback) {
   DownloadInterruptReason error_to_return = DOWNLOAD_INTERRUPT_REASON_NONE;
   RenameCompletionCallback callback_to_use = callback;
@@ -223,7 +223,7 @@ class DownloadFileWithErrorsFactory : public DownloadFileFactory {
   // DownloadFileFactory interface.
   virtual DownloadFile* CreateFile(
       scoped_ptr<DownloadSaveInfo> save_info,
-      const FilePath& default_download_directory,
+      const base::FilePath& default_download_directory,
       const GURL& url,
       const GURL& referrer_url,
       bool calculate_hash,
@@ -257,7 +257,7 @@ DownloadFileWithErrorsFactory::~DownloadFileWithErrorsFactory() {
 
 DownloadFile* DownloadFileWithErrorsFactory::CreateFile(
     scoped_ptr<DownloadSaveInfo> save_info,
-    const FilePath& default_download_directory,
+    const base::FilePath& default_download_directory,
     const GURL& url,
     const GURL& referrer_url,
     bool calculate_hash,
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
index 178366d9..90e3b38 100644
--- a/content/public/test/test_launcher.cc
+++ b/content/public/test/test_launcher.cc
@@ -68,7 +68,7 @@ const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
 const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
 
 // The default output file for XML output.
-const FilePath::CharType kDefaultOutputFile[] = FILE_PATH_LITERAL(
+const base::FilePath::CharType kDefaultOutputFile[] = FILE_PATH_LITERAL(
     "test_detail.xml");
 
 // Quit test execution after this number of tests has timed out.
@@ -166,23 +166,24 @@ ResultsPrinter::ResultsPrinter(const CommandLine& command_line) : out_(NULL) {
     return;
   std::string flag = command_line.GetSwitchValueASCII(kGTestOutputFlag);
   size_t colon_pos = flag.find(':');
-  FilePath path;
+  base::FilePath path;
   if (colon_pos != std::string::npos) {
-    FilePath flag_path = command_line.GetSwitchValuePath(kGTestOutputFlag);
-    FilePath::StringType path_string = flag_path.value();
-    path = FilePath(path_string.substr(colon_pos + 1));
+    base::FilePath flag_path =
+        command_line.GetSwitchValuePath(kGTestOutputFlag);
+    base::FilePath::StringType path_string = flag_path.value();
+    path = base::FilePath(path_string.substr(colon_pos + 1));
     // If the given path ends with '/', consider it is a directory.
     // Note: This does NOT check that a directory (or file) actually exists
     // (the behavior is same as what gtest does).
     if (file_util::EndsWithSeparator(path)) {
-      FilePath executable = command_line.GetProgram().BaseName();
+      base::FilePath executable = command_line.GetProgram().BaseName();
       path = path.Append(executable.ReplaceExtension(
-          FilePath::StringType(FILE_PATH_LITERAL("xml"))));
+          base::FilePath::StringType(FILE_PATH_LITERAL("xml"))));
     }
   }
   if (path.value().empty())
-    path = FilePath(kDefaultOutputFile);
-  FilePath dir_name = path.DirName();
+    path = base::FilePath(kDefaultOutputFile);
+  base::FilePath dir_name = path.DirName();
   if (!file_util::DirectoryExists(dir_name)) {
     LOG(WARNING) << "The output directory does not exist. "
                  << "Creating the directory: " << dir_name.value();
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index f350151..7fa3823 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -49,7 +49,7 @@ void InitSkGraphics() {
 
 class SkPictureRecorder : public WebViewBenchmarkSupport::PaintClient {
  public:
-  explicit SkPictureRecorder(const FilePath& dirpath)
+  explicit SkPictureRecorder(const base::FilePath& dirpath)
       : dirpath_(dirpath),
         layer_id_(0) {
     // Let skia register known effect subclasses. This basically enables
@@ -77,7 +77,7 @@ class SkPictureRecorder : public WebViewBenchmarkSupport::PaintClient {
   }
 
  private:
-  FilePath dirpath_;
+  base::FilePath dirpath_;
   int layer_id_;
   SkPicture picture_;
 };
@@ -220,8 +220,8 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     if (!benchmark_support)
       return v8::Undefined();
 
-    FilePath dirpath(FilePath::StringType(*dirname,
-                                          *dirname + dirname.length()));
+    base::FilePath dirpath(
+        base::FilePath::StringType(*dirname, *dirname + dirname.length()));
     if (!file_util::CreateDirectory(dirpath) ||
         !file_util::PathIsWritable(dirpath)) {
       std::string msg("Path is not writable: ");
diff --git a/content/renderer/hyphenator/hyphenator_unittest.cc b/content/renderer/hyphenator/hyphenator_unittest.cc
index b849929..2d41503 100644
--- a/content/renderer/hyphenator/hyphenator_unittest.cc
+++ b/content/renderer/hyphenator/hyphenator_unittest.cc
@@ -44,7 +44,7 @@ class MockListener : public IPC::Listener {
 
     // Open the default dictionary and call the OnControllMessageReceived
     // function with a HyphenatorMsg_SetDictionary message.
-    FilePath dictionary_path;
+    base::FilePath dictionary_path;
     if (!PathService::Get(base::DIR_SOURCE_ROOT, &dictionary_path))
       return false;
     dictionary_path = dictionary_path.AppendASCII("third_party");
@@ -84,7 +84,7 @@ class HyphenatorTest : public testing::Test {
   }
 
   bool Initialize() {
-    FilePath dictionary_path;
+    base::FilePath dictionary_path;
     if (!PathService::Get(base::DIR_SOURCE_ROOT, &dictionary_path))
       return false;
     dictionary_path = dictionary_path.AppendASCII("third_party");
diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc
index 322603a..98edda5 100644
--- a/content/renderer/pepper/pepper_file_chooser_host.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -101,9 +101,9 @@ void PepperFileChooserHost::StoreChosenFiles(
   std::vector<ppapi::PPB_FileRef_CreateInfo> chosen_files;
   for (size_t i = 0; i < files.size(); i++) {
 #if defined(OS_WIN)
-    FilePath file_path(UTF8ToWide(files[i].path));
+    base::FilePath file_path(UTF8ToWide(files[i].path));
 #else
-    FilePath file_path(files[i].path);
+    base::FilePath file_path(files[i].path);
 #endif
 
     webkit::ppapi::PPB_FileRef_Impl* ref =
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
index 556f130..f49ab533 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -61,7 +61,7 @@ class PepperFileChooserHostTest : public RenderViewTest {
 };
 
 // For testing to convert our hardcoded file paths to 8-bit.
-std::string FilePathToUTF8(const FilePath::StringType& path) {
+std::string FilePathToUTF8(const base::FilePath::StringType& path) {
 #if defined(OS_WIN)
   return UTF16ToUTF8(path);
 #else
@@ -107,7 +107,7 @@ TEST_F(PepperFileChooserHostTest, Show) {
   // path separator so we include both a Unix and a Windows one.
   ui::SelectedFileInfo selected_info;
   selected_info.display_name = FILE_PATH_LITERAL("Hello, world");
-  selected_info.local_path = FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
+  selected_info.local_path = base::FilePath(FILE_PATH_LITERAL("myp\\ath/foo"));
   std::vector<ui::SelectedFileInfo> selected_info_vector;
   selected_info_vector.push_back(selected_info);
   RenderViewImpl* view_impl = static_cast<RenderViewImpl*>(view_);
diff --git a/content/renderer/pepper/pepper_file_io_host.cc b/content/renderer/pepper/pepper_file_io_host.cc
index e6e2b52..d0fb617 100644
--- a/content/renderer/pepper/pepper_file_io_host.cc
+++ b/content/renderer/pepper/pepper_file_io_host.cc
@@ -57,7 +57,7 @@ class PlatformGeneralCallbackTranslator
   }
 
   virtual void DidReadMetadata(const base::PlatformFileInfo& file_info,
-                               const FilePath& platform_path) OVERRIDE {
+                               const base::FilePath& platform_path) OVERRIDE {
     NOTREACHED();
   }
 
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.cc b/content/renderer/pepper/pepper_hung_plugin_filter.cc
index 7d0574d..26632af 100644
--- a/content/renderer/pepper/pepper_hung_plugin_filter.cc
+++ b/content/renderer/pepper/pepper_hung_plugin_filter.cc
@@ -23,9 +23,10 @@ const int kBlockedHardThresholdSec = kHungThresholdSec * 1.5;
 
 }  // namespace
 
-PepperHungPluginFilter::PepperHungPluginFilter(const FilePath& plugin_path,
-                                               int view_routing_id,
-                                               int plugin_child_id)
+PepperHungPluginFilter::PepperHungPluginFilter(
+    const base::FilePath& plugin_path,
+    int view_routing_id,
+    int plugin_child_id)
     : plugin_path_(plugin_path),
       view_routing_id_(view_routing_id),
       plugin_child_id_(plugin_child_id),
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h
index 35fc45e..20b8ae5 100644
--- a/content/renderer/pepper/pepper_hung_plugin_filter.h
+++ b/content/renderer/pepper/pepper_hung_plugin_filter.h
@@ -34,7 +34,7 @@ class PepperHungPluginFilter
   // send messages to the browser via that view's route. The |plugin_child_id|
   // is the ID in the browser process of the pepper plugin process host. We use
   // this to identify the proper plugin process to terminate.
-  PepperHungPluginFilter(const FilePath& plugin_path,
+  PepperHungPluginFilter(const base::FilePath& plugin_path,
                          int view_routing_id,
                          int plugin_child_id);
 
@@ -74,7 +74,7 @@ class PepperHungPluginFilter
 
   base::Lock lock_;
 
-  FilePath plugin_path_;
+  base::FilePath plugin_path_;
   int view_routing_id_;
   int plugin_child_id_;
 
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index f383290..895681f 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -271,7 +271,7 @@ class AsyncOpenFileSystemURLCallbackTranslator
   }
   virtual void DidReadMetadata(
       const base::PlatformFileInfo& file_info,
-      const FilePath& platform_path) OVERRIDE {
+      const base::FilePath& platform_path) OVERRIDE {
     NOTREACHED();
   }
   virtual void DidCreateSnapshotFile(
@@ -377,7 +377,7 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
   *pepper_plugin_was_registered = true;
 
   // See if a module has already been loaded for this plugin.
-  FilePath path(webplugin_info.path);
+  base::FilePath path(webplugin_info.path);
   scoped_refptr<webkit::ppapi::PluginModule> module =
       PepperPluginRegistry::GetInstance()->GetLiveModule(path);
   if (module) {
@@ -439,7 +439,7 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
 
 RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule(
     scoped_refptr<webkit::ppapi::PluginModule> module,
-    const FilePath& path,
+    const base::FilePath& path,
     ppapi::PpapiPermissions permissions,
     const IPC::ChannelHandle& channel_handle,
     base::ProcessId peer_pid,
@@ -461,7 +461,7 @@ scoped_refptr<PepperBrokerImpl> PepperPluginDelegateImpl::CreateBroker(
   DCHECK(!plugin_module->GetBroker());
 
   // The broker path is the same as the plugin.
-  const FilePath& broker_path = plugin_module->path();
+  const base::FilePath& broker_path = plugin_module->path();
 
   scoped_refptr<PepperBrokerImpl> broker =
       new PepperBrokerImpl(plugin_module, this);
@@ -484,7 +484,7 @@ scoped_refptr<PepperBrokerImpl> PepperPluginDelegateImpl::CreateBroker(
 
 RendererPpapiHost* PepperPluginDelegateImpl::CreateOutOfProcessModule(
     webkit::ppapi::PluginModule* module,
-    const FilePath& path,
+    const base::FilePath& path,
     ppapi::PpapiPermissions permissions,
     const IPC::ChannelHandle& channel_handle,
     base::ProcessId peer_pid,
@@ -803,7 +803,7 @@ SkBitmap* PepperPluginDelegateImpl::GetSadPluginBitmap() {
 }
 
 WebKit::WebPlugin* PepperPluginDelegateImpl::CreatePluginReplacement(
-    const FilePath& file_path) {
+    const base::FilePath& file_path) {
   return GetContentClient()->renderer()->CreatePluginReplacement(
       render_view_, file_path);
 }
@@ -958,7 +958,7 @@ void PepperPluginDelegateImpl::OnPpapiBrokerPermissionResult(
 }
 
 bool PepperPluginDelegateImpl::AsyncOpenFile(
-    const FilePath& path,
+    const base::FilePath& path,
     int flags,
     const AsyncOpenFileCallback& callback) {
   int message_id = pending_async_open_files_.Add(
@@ -1117,7 +1117,7 @@ bool PepperPluginDelegateImpl::AsyncOpenFileSystemURL(
 }
 
 void PepperPluginDelegateImpl::SyncGetFileSystemPlatformPath(
-    const GURL& url, FilePath* platform_path) {
+    const GURL& url, base::FilePath* platform_path) {
   RenderThreadImpl::current()->Send(new FileSystemHostMsg_SyncGetPlatformPath(
       url, platform_path));
 }
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc
index fdc2459..2e9bdb8b 100644
--- a/content/renderer/pepper/renderer_ppapi_host_impl.cc
+++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
@@ -33,7 +33,7 @@ CONTENT_EXPORT RendererPpapiHost*
 RendererPpapiHost::CreateExternalPluginModule(
     scoped_refptr<PluginModule> plugin_module,
     PluginInstance* plugin_instance,
-    const FilePath& file_path,
+    const base::FilePath& file_path,
     ppapi::PpapiPermissions permissions,
     const IPC::ChannelHandle& channel_handle,
     base::ProcessId plugin_pid,
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7ee9da4..145313b 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -365,7 +365,7 @@ void RenderThreadImpl::Init() {
 
   // Note that under Linux, the media library will normally already have
   // been initialized by the Zygote before this instance became a Renderer.
-  FilePath media_path;
+  base::FilePath media_path;
   PathService::Get(DIR_MEDIA_LIBS, &media_path);
   if (!media_path.empty())
     media::InitializeMediaLibrary(media_path);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index f060f156..8d12163 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -915,7 +915,7 @@ WebKit::WebView* RenderViewImpl::webview() const {
   return static_cast<WebKit::WebView*>(webwidget());
 }
 
-void RenderViewImpl::PluginCrashed(const FilePath& plugin_path,
+void RenderViewImpl::PluginCrashed(const base::FilePath& plugin_path,
                                    base::ProcessId plugin_pid) {
   Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path, plugin_pid));
 }
@@ -4632,7 +4632,7 @@ void RenderViewImpl::LoadURLExternally(
 // webkit_glue::WebPluginPageDelegate ------------------------------------------
 
 webkit::npapi::WebPluginDelegate* RenderViewImpl::CreatePluginDelegate(
-    const FilePath& file_path,
+    const base::FilePath& file_path,
     const std::string& mime_type) {
   if (!PluginChannelHost::IsListening()) {
     LOG(ERROR) << "PluginChannelHost isn't listening";
@@ -4654,7 +4654,7 @@ webkit::npapi::WebPluginDelegate* RenderViewImpl::CreatePluginDelegate(
 }
 
 WebKit::WebPlugin* RenderViewImpl::CreatePluginReplacement(
-    const FilePath& file_path) {
+    const base::FilePath& file_path) {
   return GetContentClient()->renderer()->CreatePluginReplacement(
       this, file_path);
 }
@@ -5346,7 +5346,7 @@ void RenderViewImpl::OnCustomContextMenuAction(
 
 void RenderViewImpl::OnEnumerateDirectoryResponse(
     int id,
-    const std::vector<FilePath>& paths) {
+    const std::vector<base::FilePath>& paths) {
   if (!enumeration_completions_[id])
     return;
 
@@ -5529,8 +5529,8 @@ void RenderViewImpl::OnGetAllSavableResourceLinksForCurrentPage(
 
 void RenderViewImpl::OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
     const std::vector<GURL>& links,
-    const std::vector<FilePath>& local_paths,
-    const FilePath& local_directory_name) {
+    const std::vector<base::FilePath>& local_paths,
+    const base::FilePath& local_directory_name) {
 
   // Convert std::vector of GURLs to WebVector<WebURL>
   WebVector<WebURL> weburl_links(links);
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 23b5d93..468b39f 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -298,7 +298,8 @@ class CONTENT_EXPORT RenderViewImpl
   // (See also WebPluginPageDelegate implementation.)
 
   // Notification that the given plugin has crashed.
-  void PluginCrashed(const FilePath& plugin_path, base::ProcessId plugin_pid);
+  void PluginCrashed(const base::FilePath& plugin_path,
+                     base::ProcessId plugin_pid);
 
   // Creates a fullscreen container for a pepper plugin instance.
   RenderWidgetFullscreenPepper* CreatePepperFullscreenContainer(
@@ -735,10 +736,10 @@ class CONTENT_EXPORT RenderViewImpl
   // webkit_glue::WebPluginPageDelegate implementation -------------------------
 
   virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate(
-      const FilePath& file_path,
+      const base::FilePath& file_path,
       const std::string& mime_type) OVERRIDE;
   virtual WebKit::WebPlugin* CreatePluginReplacement(
-      const FilePath& file_path) OVERRIDE;
+      const base::FilePath& file_path) OVERRIDE;
   virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
   virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
   virtual void DidMovePlugin(
@@ -951,7 +952,8 @@ class CONTENT_EXPORT RenderViewImpl
   void OnEnablePreferredSizeChangedMode();
   void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size);
   void OnDisableAutoResize(const gfx::Size& new_size);
-  void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
+  void OnEnumerateDirectoryResponse(int id,
+                                    const std::vector<base::FilePath>& paths);
   void OnExecuteEditCommand(const std::string& name, const std::string& value);
   void OnExtendSelectionAndDelete(int before, int after);
   void OnFileChooserResponse(
@@ -960,8 +962,8 @@ class CONTENT_EXPORT RenderViewImpl
   void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
   void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
       const std::vector<GURL>& links,
-      const std::vector<FilePath>& local_paths,
-      const FilePath& local_directory_name);
+      const std::vector<base::FilePath>& local_paths,
+      const base::FilePath& local_directory_name);
   void OnMediaPlayerActionAt(const gfx::Point& location,
                              const WebKit::WebMediaPlayerAction& action);
 
diff --git a/content/renderer/renderer_main_platform_delegate_linux.cc b/content/renderer/renderer_main_platform_delegate_linux.cc
index c0b0172..a653bfe 100644
--- a/content/renderer/renderer_main_platform_delegate_linux.cc
+++ b/content/renderer/renderer_main_platform_delegate_linux.cc
@@ -68,7 +68,7 @@ void RendererMainPlatformDelegate::RunSandboxTests(bool no_sandbox) {
   // Under the setuid sandbox, we should not be able to open any file via the
   // filesystem.
   if (linux_sandbox->GetStatus() & kSandboxLinuxSUID) {
-    CHECK(!file_util::PathExists(FilePath("/proc/cpuinfo")));
+    CHECK(!file_util::PathExists(base::FilePath("/proc/cpuinfo")));
   }
 
 #if defined(__x86_64__)
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 99c336a..5c3263a 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -373,7 +373,7 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
   // these calls over to the browser process.
   std::string mime_type;
   RenderThread::Get()->Send(new MimeRegistryMsg_GetMimeTypeFromFile(
-      FilePath(webkit_base::WebStringToFilePathString(file_path)),
+      base::FilePath(webkit_base::WebStringToFilePathString(file_path)),
       &mime_type));
   return ASCIIToUTF16(mime_type);
 }
@@ -386,7 +386,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::preferredExtensionForMIMEType(
 
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
-  FilePath::StringType file_extension;
+  base::FilePath::StringType file_extension;
   RenderThread::Get()->Send(
       new MimeRegistryMsg_GetPreferredExtensionForMimeType(
           UTF16ToASCII(mime_type), &file_extension));
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
index 165f804..9a2fd46 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
@@ -73,8 +73,9 @@ static void RunTests(JNIEnv* env,
       CommandLine(argc, &argv[0]), false);
 
   // Create fifo and redirect stdout and stderr to it.
-  FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
-  FilePath fifo_path(files_dir.Append(FilePath("test.fifo")));
+  base::FilePath files_dir(
+      base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
+  base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
   CreateFIFO(fifo_path.value().c_str());
   RedirectStream(stdout, fifo_path.value().c_str(), "w");
   dup2(STDOUT_FILENO, STDERR_FILENO);
diff --git a/content/shell/paths_mac.mm b/content/shell/paths_mac.mm
index 120ca34..a2a2993 100644
--- a/content/shell/paths_mac.mm
+++ b/content/shell/paths_mac.mm
@@ -56,5 +56,5 @@ base::FilePath GetResourcesPakFilePath() {
       [base::mac::FrameworkBundle() pathForResource:@"content_shell"
                                              ofType:@"pak"];
 
-  return FilePath([pak_path fileSystemRepresentation]);
+  return base::FilePath([pak_path fileSystemRepresentation]);
 }
diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h
index 938c3b8..44e0a16 100644
--- a/content/shell/shell_browser_context.h
+++ b/content/shell/shell_browser_context.h
@@ -57,7 +57,7 @@ class ShellBrowserContext : public BrowserContext {
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
           chrome_devtools_protocol_handler);
   net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
-      const FilePath& partition_path,
+      const base::FilePath& partition_path,
       bool in_memory,
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
           blob_protocol_handler,
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 0680d39..afb1179 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -104,7 +104,7 @@ net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
 net::URLRequestContextGetter*
 ShellContentBrowserClient::CreateRequestContextForStoragePartition(
     BrowserContext* content_browser_context,
-    const FilePath& partition_path,
+    const base::FilePath& partition_path,
     bool in_memory,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 78ef9ff..40902ff 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -41,7 +41,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
           chrome_devtools_protocol_handler) OVERRIDE;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       BrowserContext* browser_context,
-      const FilePath& partition_path,
+      const base::FilePath& partition_path,
       bool in_memory,
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
           blob_protocol_handler,