Index: content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc |
diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc |
index e051d970e0da3d1d03a8cdd143642b68ff5e2ed5..130cf0811ee34249f7b3a7ba9a52800168b8af1e 100644 |
--- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc |
+++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc |
@@ -6,6 +6,7 @@ |
#include "base/bind.h" |
#include "base/file_util.h" |
+#include "base/files/file_enumerator.h" |
#include "base/threading/sequenced_worker_pool.h" |
#include "content/browser/child_process_security_policy_impl.h" |
#include "content/public/browser/browser_ppapi_host.h" |
@@ -219,17 +220,16 @@ int32_t PepperFlashFileMessageFilter::OnGetDirContents( |
} |
ppapi::DirContents contents; |
- file_util::FileEnumerator enumerator(full_path, false, |
- file_util::FileEnumerator::FILES | |
- file_util::FileEnumerator::DIRECTORIES | |
- file_util::FileEnumerator::INCLUDE_DOT_DOT); |
+ base::FileEnumerator enumerator(full_path, false, |
+ base::FileEnumerator::FILES | |
+ base::FileEnumerator::DIRECTORIES | |
+ base::FileEnumerator::INCLUDE_DOT_DOT); |
while (!enumerator.Next().empty()) { |
- file_util::FileEnumerator::FindInfo info; |
- enumerator.GetFindInfo(&info); |
+ base::FileEnumerator::FileInfo info = enumerator.GetInfo(); |
ppapi::DirEntry entry = { |
- file_util::FileEnumerator::GetFilename(info), |
- file_util::FileEnumerator::IsDirectory(info) |
+ info.GetName(), |
+ info.IsDirectory() |
}; |
contents.push_back(entry); |
} |