| Index: trunk/src/third_party/leveldatabase/env_chromium.cc
|
| ===================================================================
|
| --- trunk/src/third_party/leveldatabase/env_chromium.cc (revision 198849)
|
| +++ trunk/src/third_party/leveldatabase/env_chromium.cc (working copy)
|
| @@ -10,7 +10,6 @@
|
| #include "base/at_exit.h"
|
| #include "base/debug/trace_event.h"
|
| #include "base/file_util.h"
|
| -#include "base/files/file_enumerator.h"
|
| #include "base/files/file_path.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/memory/ref_counted.h"
|
| @@ -455,8 +454,8 @@
|
| virtual Status GetChildren(const std::string& dir,
|
| std::vector<std::string>* result) {
|
| result->clear();
|
| - base::FileEnumerator iter(
|
| - CreateFilePath(dir), false, base::FileEnumerator::FILES);
|
| + ::file_util::FileEnumerator iter(
|
| + CreateFilePath(dir), false, ::file_util::FileEnumerator::FILES);
|
| base::FilePath current = iter.Next();
|
| while (!current.empty()) {
|
| result->push_back(FilePathToString(current.BaseName()));
|
|
|