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

storage/browser/fileapi/local_file_util.h

Index: storage/browser/fileapi/local_file_util.h
diff --git a/webkit/browser/fileapi/local_file_util.h b/storage/browser/fileapi/local_file_util.h
similarity index 47%
rename from webkit/browser/fileapi/local_file_util.h
rename to storage/browser/fileapi/local_file_util.h
index 18199ad6f5614f68a38859fb59d647d0887ce4df..c9e15f22e4ce036e158bce69bbba18f313cd6aa8 100644
--- a/webkit/browser/fileapi/local_file_util.h
+++ b/storage/browser/fileapi/local_file_util.h
@@ -8,8 +8,8 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/browser/fileapi/file_system_file_util.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "storage/browser/fileapi/file_system_file_util.h"
+#include "storage/common/storage_export.h"
 
 namespace base {
 class Time;
@@ -17,35 +17,32 @@ class Time;
 
 class GURL;
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemOperationContext;
 class FileSystemURL;
 
 // An instance of this class is created and owned by *FileSystemBackend.
-class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileUtil
-    : public FileSystemFileUtil {
+class STORAGE_EXPORT LocalFileUtil : public FileSystemFileUtil {
  public:
   LocalFileUtil();
   virtual ~LocalFileUtil();
 
-  virtual base::File CreateOrOpen(
-      FileSystemOperationContext* context,
-      const FileSystemURL& url,
-      int file_flags) OVERRIDE;
+  virtual base::File CreateOrOpen(FileSystemOperationContext* context,
+                                  const FileSystemURL& url,
+                                  int file_flags) OVERRIDE;
   virtual base::File::Error EnsureFileExists(
       FileSystemOperationContext* context,
-      const FileSystemURL& url, bool* created) OVERRIDE;
-  virtual base::File::Error CreateDirectory(
-      FileSystemOperationContext* context,
       const FileSystemURL& url,
-      bool exclusive,
-      bool recursive) OVERRIDE;
-  virtual base::File::Error GetFileInfo(
-      FileSystemOperationContext* context,
-      const FileSystemURL& url,
-      base::File::Info* file_info,
-      base::FilePath* platform_file) OVERRIDE;
+      bool* created) OVERRIDE;
+  virtual base::File::Error CreateDirectory(FileSystemOperationContext* context,
+                                            const FileSystemURL& url,
+                                            bool exclusive,
+                                            bool recursive) OVERRIDE;
+  virtual base::File::Error GetFileInfo(FileSystemOperationContext* context,
+                                        const FileSystemURL& url,
+                                        base::File::Info* file_info,
+                                        base::FilePath* platform_file) OVERRIDE;
   virtual scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
       FileSystemOperationContext* context,
       const FileSystemURL& root_url) OVERRIDE;
@@ -58,27 +55,23 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileUtil
       const FileSystemURL& url,
       const base::Time& last_access_time,
       const base::Time& last_modified_time) OVERRIDE;
-  virtual base::File::Error Truncate(
-      FileSystemOperationContext* context,
-      const FileSystemURL& url,
-      int64 length) OVERRIDE;
-  virtual base::File::Error CopyOrMoveFile(
-      FileSystemOperationContext* context,
-      const FileSystemURL& src_url,
-      const FileSystemURL& dest_url,
-      CopyOrMoveOption option,
-      bool copy) OVERRIDE;
+  virtual base::File::Error Truncate(FileSystemOperationContext* context,
+                                     const FileSystemURL& url,
+                                     int64 length) OVERRIDE;
+  virtual base::File::Error CopyOrMoveFile(FileSystemOperationContext* context,
+                                           const FileSystemURL& src_url,
+                                           const FileSystemURL& dest_url,
+                                           CopyOrMoveOption option,
+                                           bool copy) OVERRIDE;
   virtual base::File::Error CopyInForeignFile(
       FileSystemOperationContext* context,
       const base::FilePath& src_file_path,
       const FileSystemURL& dest_url) OVERRIDE;
-  virtual base::File::Error DeleteFile(
-      FileSystemOperationContext* context,
-      const FileSystemURL& url) OVERRIDE;
-  virtual base::File::Error DeleteDirectory(
-      FileSystemOperationContext* context,
-      const FileSystemURL& url) OVERRIDE;
-  virtual webkit_blob::ScopedFile CreateSnapshotFile(
+  virtual base::File::Error DeleteFile(FileSystemOperationContext* context,
+                                       const FileSystemURL& url) OVERRIDE;
+  virtual base::File::Error DeleteDirectory(FileSystemOperationContext* context,
+                                            const FileSystemURL& url) OVERRIDE;
+  virtual storage::ScopedFile CreateSnapshotFile(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Error* error,
@@ -89,6 +82,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileUtil
   DISALLOW_COPY_AND_ASSIGN(LocalFileUtil);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_LOCAL_FILE_UTIL_H_