| Index: trunk/src/chrome/browser/extensions/api/developer_private/developer_private_api.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/extensions/api/developer_private/developer_private_api.cc (revision 198849)
|
| +++ trunk/src/chrome/browser/extensions/api/developer_private/developer_private_api.cc (working copy)
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/base64.h"
|
| #include "base/file_util.h"
|
| -#include "base/files/file_enumerator.h"
|
| #include "base/i18n/file_util_icu.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/utf_string_conversions.h"
|
| @@ -80,8 +79,9 @@
|
| }
|
|
|
| std::vector<base::FilePath> ListFolder(const base::FilePath path) {
|
| - base::FileEnumerator files(path, false,
|
| - base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
|
| + file_util::FileEnumerator files(path, false,
|
| + file_util::FileEnumerator::DIRECTORIES
|
| + | file_util::FileEnumerator::FILES);
|
| std::vector<base::FilePath> paths;
|
|
|
| for (base::FilePath current_path = files.Next(); !current_path.empty();
|
|
|