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

chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc

Index: chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
index ef3803b6a72cc949059e8d9675fd7378adcde952..aa8faab5a94d0b8f899258f27b92607656617ca9 100644
--- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
+++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc
@@ -14,15 +14,15 @@
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/net_errors.h"
-#include "webkit/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_context.h"
 
-using webkit_blob::FileStreamReader;
+using storage::FileStreamReader;
 
 namespace {
 
 // Called on the IO thread.
 MTPDeviceAsyncDelegate* GetMTPDeviceDelegate(
-    const fileapi::FileSystemURL& url) {
+    const storage::FileSystemURL& url) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   return MTPDeviceMapService::GetInstance()->GetMTPDeviceAsyncDelegate(
       url.filesystem_id());
@@ -41,7 +41,9 @@ void CallInt64CompletionCallbackWithPlatformFileError(
 }
 
 void ReadBytes(
-    const fileapi::FileSystemURL& url, net::IOBuffer* buf, int64 offset,
+    const storage::FileSystemURL& url,
+    net::IOBuffer* buf,
+    int64 offset,
     int buf_len,
     const MTPDeviceAsyncDelegate::ReadBytesSuccessCallback& success_callback,
     const net::CompletionCallback& error_callback) {
@@ -63,8 +65,8 @@ void ReadBytes(
 }  // namespace
 
 MTPFileStreamReader::MTPFileStreamReader(
-    fileapi::FileSystemContext* file_system_context,
-    const fileapi::FileSystemURL& url,
+    storage::FileSystemContext* file_system_context,
+    const storage::FileSystemURL& url,
     int64 initial_offset,
     const base::Time& expected_modification_time,
     bool do_media_header_validation)