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

chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc

Index: chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc
index 4b4a827e303d60ab9e473633f96a0f139980d9e8..9ba044ceefad49b295ad738780c4f3b529000b06 100644
--- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc
+++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc
@@ -74,7 +74,7 @@ bool FakeProvidedFileSystem::GetEntry(const base::FilePath& entry_path,
 }
 
 void FakeProvidedFileSystem::RequestUnmount(
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK));
 }
@@ -99,18 +99,18 @@ void FakeProvidedFileSystem::GetMetadata(
 
 void FakeProvidedFileSystem::ReadDirectory(
     const base::FilePath& directory_path,
-    const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback) {
-  fileapi::AsyncFileUtil::EntryList entry_list;
+    const storage::AsyncFileUtil::ReadDirectoryCallback& callback) {
+  storage::AsyncFileUtil::EntryList entry_list;
 
   for (Entries::const_iterator it = entries_.begin(); it != entries_.end();
        ++it) {
     const base::FilePath file_path = it->first;
     if (file_path == directory_path || directory_path.IsParent(file_path)) {
       const EntryMetadata& metadata = it->second.metadata;
-      entry_list.push_back(fileapi::DirectoryEntry(
+      entry_list.push_back(storage::DirectoryEntry(
           metadata.name,
-          metadata.is_directory ? fileapi::DirectoryEntry::DIRECTORY
-                                : fileapi::DirectoryEntry::FILE,
+          metadata.is_directory ? storage::DirectoryEntry::DIRECTORY
+                                : storage::DirectoryEntry::FILE,
           metadata.size,
           metadata.modification_time));
     }
@@ -143,7 +143,7 @@ void FakeProvidedFileSystem::OpenFile(const base::FilePath& entry_path,
 
 void FakeProvidedFileSystem::CloseFile(
     int file_handle,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   const OpenedFilesMap::iterator opened_file_it =
       opened_files_.find(file_handle);
 
@@ -222,7 +222,7 @@ void FakeProvidedFileSystem::CreateDirectory(
     const base::FilePath& directory_path,
     bool exclusive,
     bool recursive,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   // TODO(mtomasz): Implement it once needed.
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK));
@@ -231,7 +231,7 @@ void FakeProvidedFileSystem::CreateDirectory(
 void FakeProvidedFileSystem::DeleteEntry(
     const base::FilePath& entry_path,
     bool recursive,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   // TODO(mtomasz): Implement it once needed.
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK));
@@ -239,7 +239,7 @@ void FakeProvidedFileSystem::DeleteEntry(
 
 void FakeProvidedFileSystem::CreateFile(
     const base::FilePath& file_path,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   const base::File::Error result = file_path.AsUTF8Unsafe() != kFakeFilePath
                                        ? base::File::FILE_ERROR_EXISTS
                                        : base::File::FILE_OK;
@@ -251,7 +251,7 @@ void FakeProvidedFileSystem::CreateFile(
 void FakeProvidedFileSystem::CopyEntry(
     const base::FilePath& source_path,
     const base::FilePath& target_path,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK));
 }
@@ -259,7 +259,7 @@ void FakeProvidedFileSystem::CopyEntry(
 void FakeProvidedFileSystem::MoveEntry(
     const base::FilePath& source_path,
     const base::FilePath& target_path,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK));
 }
@@ -267,7 +267,7 @@ void FakeProvidedFileSystem::MoveEntry(
 void FakeProvidedFileSystem::Truncate(
     const base::FilePath& file_path,
     int64 length,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK));
 }
@@ -277,7 +277,7 @@ void FakeProvidedFileSystem::WriteFile(
     net::IOBuffer* buffer,
     int64 offset,
     int length,
-    const fileapi::AsyncFileUtil::StatusCallback& callback) {
+    const storage::AsyncFileUtil::StatusCallback& callback) {
   const OpenedFilesMap::iterator opened_file_it =
       opened_files_.find(file_handle);