| Index: webkit/tools/test_shell/simple_file_system.cc
|
| diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
|
| index 8b23259562d99ca06d35ea74ec58fda221e2cc74..8ac867a39e0d49fdc685154b5846025c838f4bd2 100644
|
| --- a/webkit/tools/test_shell/simple_file_system.cc
|
| +++ b/webkit/tools/test_shell/simple_file_system.cc
|
| @@ -21,6 +21,7 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
|
| #include "webkit/base/file_path_string_conversions.h"
|
| #include "webkit/blob/blob_storage_controller.h"
|
| +#include "webkit/fileapi/directory_entry.h"
|
| #include "webkit/fileapi/file_permission_policy.h"
|
| #include "webkit/fileapi/file_system_mount_point_provider.h"
|
| #include "webkit/fileapi/file_system_url.h"
|
| @@ -43,6 +44,7 @@ using WebKit::WebVector;
|
|
|
| using webkit_blob::BlobData;
|
| using webkit_blob::BlobStorageController;
|
| +using fileapi::DirectoryEntry;
|
| using fileapi::FileSystemContext;
|
| using fileapi::FileSystemOperation;
|
| using fileapi::FileSystemTaskRunners;
|
| @@ -343,12 +345,12 @@ void SimpleFileSystem::DidGetMetadata(WebFileSystemCallbacks* callbacks,
|
| void SimpleFileSystem::DidReadDirectory(
|
| WebFileSystemCallbacks* callbacks,
|
| base::PlatformFileError result,
|
| - const std::vector<base::FileUtilProxy::Entry>& entries,
|
| + const std::vector<DirectoryEntry>& entries,
|
| bool has_more) {
|
| if (result == base::PLATFORM_FILE_OK) {
|
| std::vector<WebFileSystemEntry> web_entries_vector;
|
| - for (std::vector<base::FileUtilProxy::Entry>::const_iterator it =
|
| - entries.begin(); it != entries.end(); ++it) {
|
| + for (std::vector<DirectoryEntry>::const_iterator it = entries.begin();
|
| + it != entries.end(); ++it) {
|
| WebFileSystemEntry entry;
|
| entry.name = webkit_base::FilePathStringToWebString(it->name);
|
| entry.isDirectory = it->is_directory;
|
|
|