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

storage/browser/fileapi/file_system_operation_runner.h

Index: storage/browser/fileapi/file_system_operation_runner.h
diff --git a/webkit/browser/fileapi/file_system_operation_runner.h b/storage/browser/fileapi/file_system_operation_runner.h
similarity index 91%
rename from webkit/browser/fileapi/file_system_operation_runner.h
rename to storage/browser/fileapi/file_system_operation_runner.h
index e943f2874544d31d49d13cb06491b456add99e5c..06f15b2fb5ab8a4b739466b7f516869fde2a0bb5 100644
--- a/webkit/browser/fileapi/file_system_operation_runner.h
+++ b/storage/browser/fileapi/file_system_operation_runner.h
@@ -13,16 +13,16 @@
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "webkit/browser/blob/blob_data_handle.h"
-#include "webkit/browser/fileapi/file_system_operation.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "storage/browser/blob/blob_data_handle.h"
+#include "storage/browser/fileapi/file_system_operation.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/common/storage_export.h"
 
 namespace net {
 class URLRequestContext;
 }
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemURL;
 class FileSystemContext;
@@ -34,7 +34,7 @@ class FileSystemContext;
 // operation fails, in addition to dispatching the callback with an error
 // code (therefore in most cases the caller does not need to check the
 // returned operation ID).
-class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOperationRunner
+class STORAGE_EXPORT FileSystemOperationRunner
     : public base::SupportsWeakPtr<FileSystemOperationRunner> {
  public:
   typedef FileSystemOperation::GetMetadataCallback GetMetadataCallback;
@@ -104,21 +104,23 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOperationRunner
 
   // Removes a file or directory at |url|. If |recursive| is true, remove
   // all files and directories under the directory at |url| recursively.
-  OperationID Remove(const FileSystemURL& url, bool recursive,
+  OperationID Remove(const FileSystemURL& url,
+                     bool recursive,
                      const StatusCallback& callback);
 
   // Writes contents of |blob_url| to |url| at |offset|.
   // |url_request_context| is used to read contents in |blob|.
   OperationID Write(const net::URLRequestContext* url_request_context,
                     const FileSystemURL& url,
-                    scoped_ptr<webkit_blob::BlobDataHandle> blob,
+                    scoped_ptr<storage::BlobDataHandle> blob,
                     int64 offset,
                     const WriteCallback& callback);
 
   // Truncates a file at |url| to |length|. If |length| is larger than
   // the original file size, the file will be extended, and the extended
   // part is filled with null bytes.
-  OperationID Truncate(const FileSystemURL& url, int64 length,
+  OperationID Truncate(const FileSystemURL& url,
+                       int64 length,
                        const StatusCallback& callback);
 
   // Tries to cancel the operation |id| [we support cancelling write or
@@ -268,26 +270,24 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOperationRunner
                 base::File::Error rv,
                 int64 bytes,
                 bool complete);
-  void DidOpenFile(
-      const OperationHandle& handle,
-      const OpenFileCallback& callback,
-      base::File file,
-      const base::Closure& on_close_callback);
+  void DidOpenFile(const OperationHandle& handle,
+                   const OpenFileCallback& callback,
+                   base::File file,
+                   const base::Closure& on_close_callback);
   void DidCreateSnapshot(
       const OperationHandle& handle,
       const SnapshotFileCallback& callback,
       base::File::Error rv,
       const base::File::Info& file_info,
       const base::FilePath& platform_path,
-      const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
+      const scoped_refptr<storage::ShareableFileReference>& file_ref);
 
-  void OnCopyProgress(
-      const OperationHandle& handle,
-      const CopyProgressCallback& callback,
-      FileSystemOperation::CopyProgressType type,
-      const FileSystemURL& source_url,
-      const FileSystemURL& dest_url,
-      int64 size);
+  void OnCopyProgress(const OperationHandle& handle,
+                      const CopyProgressCallback& callback,
+                      FileSystemOperation::CopyProgressType type,
+                      const FileSystemURL& source_url,
+                      const FileSystemURL& dest_url,
+                      int64 size);
 
   void PrepareForWrite(OperationID id, const FileSystemURL& url);
   void PrepareForRead(OperationID id, const FileSystemURL& url);
@@ -317,6 +317,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOperationRunner
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperationRunner);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_RUNNER_H_