| Index: chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
|
| diff --git a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
|
| index 0282c8a0e59036e6a34428c1c550b6d75d8b796a..3625f3c931d71b977119f298bb453abe64d4d2d7 100644
|
| --- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
|
| +++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
|
| @@ -17,8 +17,8 @@
|
| #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
|
| #include "net/base/io_buffer.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
| -#include "webkit/browser/fileapi/async_file_util.h"
|
| -#include "webkit/common/fileapi/file_system_util.h"
|
| +#include "storage/browser/fileapi/async_file_util.h"
|
| +#include "storage/common/fileapi/file_system_util.h"
|
|
|
| using storage_monitor::StorageMonitor;
|
|
|
| @@ -182,12 +182,12 @@ void MTPDeviceTaskHelper::OnDidReadDirectory(
|
| if (error)
|
| return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED);
|
|
|
| - fileapi::AsyncFileUtil::EntryList entries;
|
| + storage::AsyncFileUtil::EntryList entries;
|
| base::FilePath current;
|
| MTPDeviceObjectEnumerator file_enum(file_entries);
|
| while (!(current = file_enum.Next()).empty()) {
|
| - fileapi::DirectoryEntry entry;
|
| - entry.name = fileapi::VirtualPath::BaseName(current).value();
|
| + storage::DirectoryEntry entry;
|
| + entry.name = storage::VirtualPath::BaseName(current).value();
|
| uint32 file_id = 0;
|
| bool ret = file_enum.GetEntryId(&file_id);
|
| DCHECK(ret);
|
|
|