Move storage-related files from webkit/ to new top-level directory storage/

content/browser/renderer_host/pepper/pepper_file_system_browser_host.h

Index: content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
index f6f75fb9aa5883c5f24538bc405703e8c79eadd6..b2eacce2f3334f619295bb2ce3292297d9d9203b 100644
--- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
+++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
@@ -20,7 +20,7 @@
 #include "ppapi/host/resource_host.h"
 #include "ppapi/shared_impl/file_growth.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_context.h"
 
 namespace content {
 
@@ -55,13 +55,13 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
   PP_FileSystemType GetType() const { return type_; }
   bool IsOpened() const { return opened_; }
   GURL GetRootUrl() const { return root_url_; }
-  scoped_refptr<fileapi::FileSystemContext> GetFileSystemContext() const {
+  scoped_refptr<storage::FileSystemContext> GetFileSystemContext() const {
     return file_system_context_;
   }
 
   // Supports FileIOs direct access on the host side.
   // Non-NULL only for PP_FILESYSTEMTYPE_LOCAL{PERSISTENT,TEMPORARY}.
-  fileapi::FileSystemOperationRunner* GetFileSystemOperationRunner() const {
+  storage::FileSystemOperationRunner* GetFileSystemOperationRunner() const {
     return file_system_operation_runner_.get();
   }
   bool ChecksQuota() const { return quota_reservation_ != NULL; }
@@ -69,7 +69,7 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
   // callback.
   typedef base::Callback<void(int64_t)> OpenQuotaFileCallback;
   void OpenQuotaFile(PepperFileIOHost* file_io_host,
-                     const fileapi::FileSystemURL& url,
+                     const storage::FileSystemURL& url,
                      const OpenQuotaFileCallback& callback);
   // Closes the file. This must be called after OpenQuotaFile and before the
   // PepperFileIOHost is destroyed.
@@ -81,11 +81,11 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
 
   void OpenExistingFileSystem(
       const base::Closure& callback,
-      scoped_refptr<fileapi::FileSystemContext> file_system_context);
+      scoped_refptr<storage::FileSystemContext> file_system_context);
   void OpenFileSystem(
       ppapi::host::ReplyMessageContext reply_context,
-      fileapi::FileSystemType file_system_type,
-      scoped_refptr<fileapi::FileSystemContext> file_system_context);
+      storage::FileSystemType file_system_type,
+      scoped_refptr<storage::FileSystemContext> file_system_context);
   void OpenFileSystemComplete(ppapi::host::ReplyMessageContext reply_context,
                               const GURL& root,
                               const std::string& name,
@@ -94,11 +94,11 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
       ppapi::host::ReplyMessageContext reply_context,
       const std::string& fsid,
       PP_IsolatedFileSystemType_Private type,
-      scoped_refptr<fileapi::FileSystemContext> file_system_context);
+      scoped_refptr<storage::FileSystemContext> file_system_context);
   void OpenPluginPrivateFileSystem(
       ppapi::host::ReplyMessageContext reply_context,
       const std::string& fsid,
-      scoped_refptr<fileapi::FileSystemContext> file_system_context);
+      scoped_refptr<storage::FileSystemContext> file_system_context);
   void OpenPluginPrivateFileSystemComplete(
       ppapi::host::ReplyMessageContext reply_context,
       const std::string& fsid,
@@ -122,7 +122,7 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
       int32_t error);
 
   void SetFileSystemContext(
-      scoped_refptr<fileapi::FileSystemContext> file_system_context);
+      scoped_refptr<storage::FileSystemContext> file_system_context);
 
   bool ShouldCreateQuotaReservation() const;
   void CreateQuotaReservation(const base::Closure& callback);
@@ -147,9 +147,9 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
   bool called_open_;  // whether open has been called.
   bool opened_;       // whether open succeeded.
   GURL root_url_;
-  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+  scoped_refptr<storage::FileSystemContext> file_system_context_;
 
-  scoped_ptr<fileapi::FileSystemOperationRunner> file_system_operation_runner_;
+  scoped_ptr<storage::FileSystemOperationRunner> file_system_operation_runner_;
 
   // Used only for file systems with quota.
   // When a PepperFileIOHost calls OpenQuotaFile, we add the id and a non-owning