| Index: webkit/fileapi/obfuscated_file_system_file_util.cc
|
| diff --git a/webkit/fileapi/obfuscated_file_system_file_util.cc b/webkit/fileapi/obfuscated_file_system_file_util.cc
|
| index abff6cb5845cc1796b351e12cf90c7df23f2c4b8..52113d695ba4d74d0c4793872fc833600f0b8615 100644
|
| --- a/webkit/fileapi/obfuscated_file_system_file_util.cc
|
| +++ b/webkit/fileapi/obfuscated_file_system_file_util.cc
|
| @@ -11,10 +11,10 @@
|
| #include "base/format_macros.h"
|
| #include "base/logging.h"
|
| #include "base/message_loop.h"
|
| +#include "base/stl_util.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/stringprintf.h"
|
| #include "base/sys_string_conversions.h"
|
| -#include "base/stl_util.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "webkit/fileapi/file_system_context.h"
|
| #include "webkit/fileapi/file_system_operation_context.h"
|
| @@ -902,7 +902,7 @@ bool ObfuscatedFileSystemFileUtil::MigrateFromOldSandbox(
|
| return false;
|
|
|
| file_util::FileEnumerator file_enum(src_root, true,
|
| - static_cast<file_util::FileEnumerator::FILE_TYPE>(
|
| + static_cast<file_util::FileEnumerator::FileType>(
|
| file_util::FileEnumerator::FILES |
|
| file_util::FileEnumerator::DIRECTORIES));
|
| FilePath src_full_path;
|
|
|