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

webkit/fileapi/local_file_util.cc

Index: webkit/fileapi/local_file_util.cc
diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc
index 2bfe172e3be0700518adf829b5a3d4185294edda..19694ef1623d239fbcbe667e46e2fa5a18de5d23 100644
--- a/webkit/fileapi/local_file_util.cc
+++ b/webkit/fileapi/local_file_util.cc
@@ -21,7 +21,7 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
   LocalFileEnumerator(const FilePath& platform_root_path,
                       const FilePath& virtual_root_path,
                       bool recursive,
-                      file_util::FileEnumerator::FileType file_type)
+                      int file_type)
       : file_enum_(platform_root_path, recursive, file_type),
         platform_root_path_(platform_root_path),
         virtual_root_path_(virtual_root_path) {
@@ -142,11 +142,9 @@ FileSystemFileUtil::AbstractFileEnumerator* LocalFileUtil::CreateFileEnumerator(
   if (GetLocalFilePath(context, root_url, &file_path) !=
       base::PLATFORM_FILE_OK)
     return new EmptyFileEnumerator();
-  return new LocalFileEnumerator(
-      file_path, root_url.path(), recursive,
-      static_cast<file_util::FileEnumerator::FileType>(
-          file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES));
+  return new LocalFileEnumerator(file_path, root_url.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 LocalFileUtil::GetLocalFilePath(