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

chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h"
 
 #include <algorithm>
 
 #include "base/numerics/safe_conversions.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
 #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 #include "content/public/browser/browser_thread.h"
 #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());
 }
 
 void CallCompletionCallbackWithPlatformFileError(
     const net::CompletionCallback& callback,
     base::File::Error file_error) {
   callback.Run(net::FileErrorToNetError(file_error));
 }
 
 void CallInt64CompletionCallbackWithPlatformFileError(
     const net::Int64CompletionCallback& callback,
     base::File::Error file_error) {
   callback.Run(net::FileErrorToNetError(file_error));
 }
 
 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) {
   MTPDeviceAsyncDelegate* delegate = GetMTPDeviceDelegate(url);
   if (!delegate) {
     error_callback.Run(net::ERR_FAILED);
     return;
   }
 
   delegate->ReadBytes(
       url.path(),
       make_scoped_refptr(buf),
       offset,
       buf_len,
       success_callback,
       base::Bind(&CallCompletionCallbackWithPlatformFileError, error_callback));
 }
 
 }  // 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)
     : file_system_context_(file_system_context),
       url_(url),
       current_offset_(initial_offset),
       expected_modification_time_(expected_modification_time),
       media_header_validated_(!do_media_header_validation),
       weak_factory_(this) {
 }
@@ skipping 108 matching lines @@
     const base::File::Info& file_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   if (!VerifySnapshotTime(expected_modification_time_, file_info)) {
     callback.Run(net::ERR_UPLOAD_FILE_CHANGED);
     return;
   }
 
   callback.Run(file_info.size);
 }