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

chrome/browser/chromeos/file_system_provider/provided_file_system.cc

Index: chrome/browser/chromeos/file_system_provider/provided_file_system.cc
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
index 4f8ff7d200fff3dbe8623ab76c3c7680e9b02f85..86097453e6f5534d6d78a1bf0b181dd55f65bc31 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
@@ -47,7 +47,7 @@ ProvidedFileSystem::ProvidedFileSystem(
 ProvidedFileSystem::~ProvidedFileSystem() {}
 
 void ProvidedFileSystem::RequestUnmount(
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           REQUEST_UNMOUNT,
           scoped_ptr<RequestManager::HandlerInterface>(new operations::Unmount(
@@ -69,14 +69,14 @@ void ProvidedFileSystem::GetMetadata(const base::FilePath& entry_path,
 
 void ProvidedFileSystem::ReadDirectory(
     const base::FilePath& directory_path,
-    const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback) {
+    const storage::AsyncFileUtil::ReadDirectoryCallback& callback) {
   if (!request_manager_.CreateRequest(
           READ_DIRECTORY,
           scoped_ptr<
               RequestManager::HandlerInterface>(new operations::ReadDirectory(
               event_router_, file_system_info_, directory_path, callback)))) {
     callback.Run(base::File::FILE_ERROR_SECURITY,
-                 fileapi::AsyncFileUtil::EntryList(),
+                 storage::AsyncFileUtil::EntryList(),
                  false /* has_more */);
   }
 }
@@ -121,7 +121,7 @@ void ProvidedFileSystem::OpenFile(const base::FilePath& file_path,
 
 void ProvidedFileSystem::CloseFile(
     int file_handle,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           CLOSE_FILE,
           scoped_ptr<RequestManager::HandlerInterface>(
@@ -135,7 +135,7 @@ void ProvidedFileSystem::CreateDirectory(
     const base::FilePath& directory_path,
     bool exclusive,
     bool recursive,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           CREATE_DIRECTORY,
           scoped_ptr<RequestManager::HandlerInterface>(
@@ -152,7 +152,7 @@ void ProvidedFileSystem::CreateDirectory(
 void ProvidedFileSystem::DeleteEntry(
     const base::FilePath& entry_path,
     bool recursive,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           DELETE_ENTRY,
           scoped_ptr<RequestManager::HandlerInterface>(
@@ -167,7 +167,7 @@ void ProvidedFileSystem::DeleteEntry(
 
 void ProvidedFileSystem::CreateFile(
     const base::FilePath& file_path,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           CREATE_FILE,
           scoped_ptr<RequestManager::HandlerInterface>(
@@ -180,7 +180,7 @@ void ProvidedFileSystem::CreateFile(
 void ProvidedFileSystem::CopyEntry(
     const base::FilePath& source_path,
     const base::FilePath& target_path,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           COPY_ENTRY,
           scoped_ptr<RequestManager::HandlerInterface>(
@@ -198,7 +198,7 @@ void ProvidedFileSystem::WriteFile(
     net::IOBuffer* buffer,
     int64 offset,
     int length,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   TRACE_EVENT1("file_system_provider",
                "ProvidedFileSystem::WriteFile",
                "length",
@@ -220,7 +220,7 @@ void ProvidedFileSystem::WriteFile(
 void ProvidedFileSystem::MoveEntry(
     const base::FilePath& source_path,
     const base::FilePath& target_path,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           MOVE_ENTRY,
           scoped_ptr<RequestManager::HandlerInterface>(
@@ -236,7 +236,7 @@ void ProvidedFileSystem::MoveEntry(
 void ProvidedFileSystem::Truncate(
     const base::FilePath& file_path,
     int64 length,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   if (!request_manager_.CreateRequest(
           TRUNCATE,
           scoped_ptr<RequestManager::HandlerInterface>(