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

chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc

Index: chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc
diff --git a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc
index 27a01a21a1c2c4b431aed8b92b18f56471189495..42c414b9baf1604511c9d7c0a4a3ef2b695f19d6 100644
--- a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc
+++ b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
 #include "chrome/browser/media_galleries/fileapi/device_media_async_file_util.h"
-#include "webkit/browser/blob/file_stream_reader.h"
-#include "webkit/browser/fileapi/file_stream_writer.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/file_stream_writer.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 namespace chromeos {
 
@@ -20,34 +20,34 @@ MTPFileSystemBackendDelegate::MTPFileSystemBackendDelegate(
 MTPFileSystemBackendDelegate::~MTPFileSystemBackendDelegate() {
 }
 
-fileapi::AsyncFileUtil* MTPFileSystemBackendDelegate::GetAsyncFileUtil(
-    fileapi::FileSystemType type) {
-  DCHECK_EQ(fileapi::kFileSystemTypeDeviceMediaAsFileStorage, type);
+storage::AsyncFileUtil* MTPFileSystemBackendDelegate::GetAsyncFileUtil(
+    storage::FileSystemType type) {
+  DCHECK_EQ(storage::kFileSystemTypeDeviceMediaAsFileStorage, type);
 
   return device_media_async_file_util_.get();
 }
 
-scoped_ptr<webkit_blob::FileStreamReader>
+scoped_ptr<storage::FileStreamReader>
 MTPFileSystemBackendDelegate::CreateFileStreamReader(
-    const fileapi::FileSystemURL& url,
+    const storage::FileSystemURL& url,
     int64 offset,
     const base::Time& expected_modification_time,
-    fileapi::FileSystemContext* context) {
-  DCHECK_EQ(fileapi::kFileSystemTypeDeviceMediaAsFileStorage, url.type());
+    storage::FileSystemContext* context) {
+  DCHECK_EQ(storage::kFileSystemTypeDeviceMediaAsFileStorage, url.type());
 
   return device_media_async_file_util_->GetFileStreamReader(
       url, offset, expected_modification_time, context);
 }
 
-scoped_ptr<fileapi::FileStreamWriter>
+scoped_ptr<storage::FileStreamWriter>
 MTPFileSystemBackendDelegate::CreateFileStreamWriter(
-    const fileapi::FileSystemURL& url,
+    const storage::FileSystemURL& url,
     int64 offset,
-    fileapi::FileSystemContext* context) {
-  DCHECK_EQ(fileapi::kFileSystemTypeDeviceMediaAsFileStorage, url.type());
+    storage::FileSystemContext* context) {
+  DCHECK_EQ(storage::kFileSystemTypeDeviceMediaAsFileStorage, url.type());
 
   // TODO(kinaba): support writing.
-  return scoped_ptr<fileapi::FileStreamWriter>();
+  return scoped_ptr<storage::FileStreamWriter>();
 }
 
 }  // namespace chromeos