15 files changed, 46 insertions, 43 deletions
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.