Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / mac / mtp_device_delegate_impl_mac.mm

diff --git a/src/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm b/src/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
index 8bd2167..e829a3e 100644 (file)
--- a/src/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
+++ b/src/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
@@ -11,7 +11,7 @@
 #include "components/storage_monitor/image_capture_device.h"
 #include "components/storage_monitor/image_capture_device_manager.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/async_file_util.h"
 
 namespace {
 
@@ -201,7 +201,9 @@ bool MTPDeviceDelegateImplMac::IsStreaming() {
 
 void MTPDeviceDelegateImplMac::ReadBytes(
     const base::FilePath& device_file_path,
-    net::IOBuffer* buf, int64 offset, int buf_len,
+    const scoped_refptr<net::IOBuffer>& buf,
+    int64 offset,
+    int buf_len,
     const ReadBytesSuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   NOTREACHED();
@@ -370,7 +372,7 @@ void MTPDeviceDelegateImplMac::NotifyReadDir() {
     // where we find the entry for the directory, then read out all first-level
     // children. We then break when the DirName is greater than the read_path,
     // as that means we've passed the subdir we're reading.
-    fileapi::AsyncFileUtil::EntryList entry_list;
+    storage::AsyncFileUtil::EntryList entry_list;
     bool found_path = false;
     for (size_t i = 0; i < file_paths_.size(); ++i) {
       if (file_paths_[i] == read_path) {
@@ -388,7 +390,7 @@ void MTPDeviceDelegateImplMac::NotifyReadDir() {
       base::FilePath relative_path;
       read_path.AppendRelativePath(file_paths_[i], &relative_path);
       base::File::Info info = file_info_[file_paths_[i].value()];
-      fileapi::DirectoryEntry entry;
+      storage::DirectoryEntry entry;
       entry.name = relative_path.value();
       entry.is_directory = info.is_directory;
       entry.size = info.size;