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

content/child/fileapi/file_system_dispatcher.cc

Index: content/child/fileapi/file_system_dispatcher.cc
diff --git a/content/child/fileapi/file_system_dispatcher.cc b/content/child/fileapi/file_system_dispatcher.cc
index 0a43ee84f2e08fa5fe552e989ba98220060a1d48..bb95b4b85a4d0fb66fe47cccb6195a840aabd9be 100644
--- a/content/child/fileapi/file_system_dispatcher.cc
+++ b/content/child/fileapi/file_system_dispatcher.cc
@@ -10,7 +10,7 @@
 #include "base/process/process.h"
 #include "content/child/child_thread.h"
 #include "content/common/fileapi/file_system_messages.h"
-#include "webkit/common/fileapi/file_system_info.h"
+#include "storage/common/fileapi/file_system_info.h"
 
 namespace content {
 
@@ -96,9 +96,8 @@ class FileSystemDispatcher::CallbackDispatcher {
     snapshot_callback_.Run(file_info, platform_path, request_id);
   }
 
-  void DidReadDirectory(
-      const std::vector<fileapi::DirectoryEntry>& entries,
-      bool has_more) {
+  void DidReadDirectory(const std::vector<storage::DirectoryEntry>& entries,
+                        bool has_more) {
     directory_callback_.Run(entries, has_more);
   }
 
@@ -107,7 +106,7 @@ class FileSystemDispatcher::CallbackDispatcher {
     filesystem_callback_.Run(name, root);
   }
 
-  void DidResolveURL(const fileapi::FileSystemInfo& info,
+  void DidResolveURL(const storage::FileSystemInfo& info,
                      const base::FilePath& file_path,
                      bool is_directory) {
     resolve_callback_.Run(info, file_path, is_directory);
@@ -167,7 +166,7 @@ bool FileSystemDispatcher::OnMessageReceived(const IPC::Message& msg) {
 
 void FileSystemDispatcher::OpenFileSystem(
     const GURL& origin_url,
-    fileapi::FileSystemType type,
+    storage::FileSystemType type,
     const OpenFileSystemCallback& success_callback,
     const StatusCallback& error_callback) {
   int request_id = dispatchers_.Add(
@@ -186,10 +185,9 @@ void FileSystemDispatcher::ResolveURL(
           request_id, filesystem_url));
 }
 
-void FileSystemDispatcher::DeleteFileSystem(
-    const GURL& origin_url,
-    fileapi::FileSystemType type,
-    const StatusCallback& callback) {
+void FileSystemDispatcher::DeleteFileSystem(const GURL& origin_url,
+                                            storage::FileSystemType type,
+                                            const StatusCallback& callback) {
   int request_id = dispatchers_.Add(CallbackDispatcher::Create(callback));
   ChildThread::current()->Send(new FileSystemHostMsg_DeleteFileSystem(
           request_id, origin_url, type));
@@ -341,7 +339,7 @@ void FileSystemDispatcher::OnDidOpenFileSystem(int request_id,
 }
 
 void FileSystemDispatcher::OnDidResolveURL(int request_id,
-                                           const fileapi::FileSystemInfo& info,
+                                           const storage::FileSystemInfo& info,
                                            const base::FilePath& file_path,
                                            bool is_directory) {
   DCHECK(info.root_url.is_valid());
@@ -377,7 +375,7 @@ void FileSystemDispatcher::OnDidCreateSnapshotFile(
 
 void FileSystemDispatcher::OnDidReadDirectory(
     int request_id,
-    const std::vector<fileapi::DirectoryEntry>& entries,
+    const std::vector<storage::DirectoryEntry>& entries,
     bool has_more) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);