| Index: trunk/src/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc (revision 198849)
|
| +++ trunk/src/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc (working copy)
|
| @@ -6,7 +6,6 @@
|
|
|
| #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"
|
| @@ -220,16 +219,17 @@
|
| }
|
|
|
| ppapi::DirContents contents;
|
| - base::FileEnumerator enumerator(full_path, false,
|
| - base::FileEnumerator::FILES |
|
| - base::FileEnumerator::DIRECTORIES |
|
| - base::FileEnumerator::INCLUDE_DOT_DOT);
|
| + file_util::FileEnumerator enumerator(full_path, false,
|
| + file_util::FileEnumerator::FILES |
|
| + file_util::FileEnumerator::DIRECTORIES |
|
| + file_util::FileEnumerator::INCLUDE_DOT_DOT);
|
|
|
| while (!enumerator.Next().empty()) {
|
| - base::FileEnumerator::FileInfo info = enumerator.GetInfo();
|
| + file_util::FileEnumerator::FindInfo info;
|
| + enumerator.GetFindInfo(&info);
|
| ppapi::DirEntry entry = {
|
| - info.GetName(),
|
| - info.IsDirectory()
|
| + file_util::FileEnumerator::GetFilename(info),
|
| + file_util::FileEnumerator::IsDirectory(info)
|
| };
|
| contents.push_back(entry);
|
| }
|
|
|