Rename FilePath -> base::FilePath in various toplevel directories

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

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

7 files changed, 20 insertions, 20 deletions

diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 8043adc..ccef830 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -41,7 +41,7 @@ class AwResourceContext : public content::ResourceContext {
 }  // namespace
 
 AwBrowserContext::AwBrowserContext(
-    const FilePath path,
+    const base::FilePath path,
     GeolocationPermissionFactoryFn* geolocation_permission_factory)
     : context_storage_path_(path),
       geolocation_permission_factory_(geolocation_permission_factory) {
@@ -94,7 +94,7 @@ net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
 
 net::URLRequestContextGetter*
 AwBrowserContext::CreateRequestContextForStoragePartition(
-    const FilePath& partition_path,
+    const base::FilePath& partition_path,
     bool in_memory,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
@@ -110,7 +110,7 @@ AwBrowserContext::CreateRequestContextForStoragePartition(
   return url_request_context_getter_.get();
 }
 
-FilePath AwBrowserContext::GetPath() {
+base::FilePath AwBrowserContext::GetPath() {
   return context_storage_path_;
 }
 
@@ -141,7 +141,7 @@ AwBrowserContext::GetMediaRequestContextForRenderProcess(
 
 net::URLRequestContextGetter*
 AwBrowserContext::GetMediaRequestContextForStoragePartition(
-    const FilePath& partition_path,
+    const base::FilePath& partition_path,
     bool in_memory) {
   return GetRequestContext();
 }
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
index b7f1b37..4d0bd66 100644
--- a/android_webview/browser/aw_browser_context.h
+++ b/android_webview/browser/aw_browser_context.h
@@ -40,7 +40,7 @@ class AwBrowserContext : public content::BrowserContext,
  public:
 
   AwBrowserContext(
-      const FilePath path,
+      const base::FilePath path,
       GeolocationPermissionFactoryFn* geolocation_permission_factory);
   virtual ~AwBrowserContext();
 
@@ -70,7 +70,7 @@ class AwBrowserContext : public content::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,
@@ -84,7 +84,7 @@ class AwBrowserContext : public content::BrowserContext,
           chrome_devtools_protocol_handler);
 
   // content::BrowserContext implementation.
-  virtual FilePath GetPath() OVERRIDE;
+  virtual base::FilePath GetPath() OVERRIDE;
   virtual bool IsOffTheRecord() const OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
@@ -94,7 +94,7 @@ class AwBrowserContext : public content::BrowserContext,
       int renderer_child_id) OVERRIDE;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
-          const FilePath& partition_path, bool in_memory) OVERRIDE;
+          const base::FilePath& partition_path, bool in_memory) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::DownloadManagerDelegate*
       GetDownloadManagerDelegate() OVERRIDE;
@@ -110,7 +110,7 @@ class AwBrowserContext : public content::BrowserContext,
 
  private:
   // The file path where data for this context is persisted.
-  FilePath context_storage_path_;
+  base::FilePath context_storage_path_;
 
   scoped_refptr<AwURLRequestContextGetter> url_request_context_getter_;
   GeolocationPermissionFactoryFn* geolocation_permission_factory_;
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 40ff17b..71c35e9 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -61,7 +61,7 @@ int AwBrowserMainParts::PreCreateThreads() {
   // that, seed the ResourceBundle instance with a non-string, locale
   // independant pak. Until we no longer rely on paks for strings,
   // load an extra data pack separately that has the strings in it.
-  FilePath pak_path;
+  base::FilePath pak_path;
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       pak_path.AppendASCII("webviewchromium_strings.pak"),
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 8bd40a4..4662e74 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -48,7 +48,7 @@ AwContentBrowserClient::AwContentBrowserClient(
     ViewDelegateFactoryFn* view_delegate_factory,
     GeolocationPermissionFactoryFn* geolocation_permission_factory)
     : view_delegate_factory_(view_delegate_factory) {
-  FilePath user_data_dir;
+  base::FilePath user_data_dir;
   if (!PathService::Get(base::DIR_ANDROID_APP_DATA, &user_data_dir)) {
     NOTREACHED() << "Failed to get app data directory for Android WebView";
   }
@@ -124,7 +124,7 @@ AwContentBrowserClient::CreateRequestContext(
 net::URLRequestContextGetter*
 AwContentBrowserClient::CreateRequestContextForStoragePartition(
     content::BrowserContext* browser_context,
-    const FilePath& partition_path,
+    const base::FilePath& partition_path,
     bool in_memory,
     scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
         blob_protocol_handler,
@@ -360,13 +360,13 @@ void AwContentBrowserClient::ClearCookies(content::RenderViewHost* rvh) {
   NOTIMPLEMENTED();
 }
 
-FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() {
+base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() {
   // Android WebView does not currently use the Chromium downloads system.
   // Download requests are cancelled immedately when recognized; see
   // AwResourceDispatcherHost::CreateResourceHandlerForDownload. However the
   // download system still tries to start up and calls this before recognizing
   // the request has been cancelled.
-  return FilePath();
+  return base::FilePath();
 }
 
 std::string AwContentBrowserClient::GetDefaultDownloadName() {
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 59a1c9e..9ff4f6c 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -53,7 +53,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
           chrome_devtools_protocol_handler) OVERRIDE;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       content::BrowserContext* browser_context,
-      const FilePath& partition_path,
+      const base::FilePath& partition_path,
       bool in_memory,
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
           blob_protocol_handler,
@@ -150,7 +150,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
   virtual void ClearInspectorSettings(content::RenderViewHost* rvh) OVERRIDE;
   virtual void ClearCache(content::RenderViewHost* rvh) OVERRIDE;
   virtual void ClearCookies(content::RenderViewHost* rvh) OVERRIDE;
-  virtual FilePath GetDefaultDownloadDirectory() OVERRIDE;
+  virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE;
   virtual std::string GetDefaultDownloadName() OVERRIDE;
   virtual void DidCreatePpapiPlugin(
       content::BrowserPpapiHost* browser_host) OVERRIDE;
diff --git a/android_webview/browser/aw_download_manager_delegate.cc b/android_webview/browser/aw_download_manager_delegate.cc
index 9eca137..0c3397a 100644
--- a/android_webview/browser/aw_download_manager_delegate.cc
+++ b/android_webview/browser/aw_download_manager_delegate.cc
@@ -19,10 +19,10 @@ bool AwDownloadManagerDelegate::DetermineDownloadTarget(
   // Note this cancel is independent of the URLRequest cancel in
   // AwResourceDispatcherHostDelegate::DownloadStarting. The request
   // could have already finished by the time DownloadStarting is called.
-  callback.Run(FilePath() /* Empty file path for cancel */,
+  callback.Run(base::FilePath() /* Empty file path for cancel */,
                content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
                content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-               FilePath());
+               base::FilePath());
   return true;
 }
 
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index a0438a31d..1fd2ec1 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -584,7 +584,7 @@ void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
 
 namespace {
 void GenerateMHTMLCallback(ScopedJavaGlobalRef<jobject>* callback,
-                           const FilePath& path, int64 size) {
+                           const base::FilePath& path, int64 size) {
   JNIEnv* env = AttachCurrentThread();
   // Android files are UTF8, so the path conversion below is safe.
   Java_AwContents_generateMHTMLCallback(
@@ -599,7 +599,7 @@ void AwContents::GenerateMHTML(JNIEnv* env, jobject obj,
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
   web_contents_->GenerateMHTML(
-      FilePath(ConvertJavaStringToUTF8(env, jpath)),
+      base::FilePath(ConvertJavaStringToUTF8(env, jpath)),
       base::Bind(&GenerateMHTMLCallback, base::Owned(j_callback)));
 }