Change the type of file_type parameter to int, as the parameter actually takes or-ed bitmasks,

webkit/fileapi/native_file_util.cc

Index: webkit/fileapi/native_file_util.cc
diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc
index 6a9d5cdeb2ebb03604deef20850115a3589c10a1..b03fea4774032da25f18b965cdd52625bd9c3543 100644
--- a/webkit/fileapi/native_file_util.cc
+++ b/webkit/fileapi/native_file_util.cc
@@ -39,7 +39,7 @@ class NativeFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
  public:
   NativeFileEnumerator(const FilePath& root_path,
                        bool recursive,
-                       file_util::FileEnumerator::FileType file_type)
+                       int file_type)
     : file_enum_(root_path, recursive, file_type) {
 #if defined(OS_WIN)
     memset(&file_util_info_, 0, sizeof(file_util_info_));
@@ -158,11 +158,9 @@ PlatformFileError NativeFileUtil::GetFileInfo(
 FileSystemFileUtil::AbstractFileEnumerator*
 NativeFileUtil::CreateFileEnumerator(const FilePath& root_path,
                                      bool recursive) {
-  return new NativeFileEnumerator(
-      root_path, recursive,
-      static_cast<file_util::FileEnumerator::FileType>(
-          file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES));
+  return new NativeFileEnumerator(root_path, recursive,
+      (file_util::FileEnumerator::FILES |

[kinuko, 2012/08/07 05:23:11]

ditto

[Haruki Sato, 2012/08/07 13:34:25]

Done.

+       file_util::FileEnumerator::DIRECTORIES));
 }
 
 PlatformFileError NativeFileUtil::Touch(