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..7a746252141aac4d8d0c9881c17da687d235a762 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) {
@@ -144,9 +144,8 @@ FileSystemFileUtil::AbstractFileEnumerator* LocalFileUtil::CreateFileEnumerator(
     return new EmptyFileEnumerator();
   return new LocalFileEnumerator(
       file_path, root_url.path(), recursive,

[jar (doing other things), 2012/08/06 18:27:02]

nit:push 146 onto end of 145.

[Haruki Sato, 2012/08/06 23:22:18]

Done.

-      static_cast<file_util::FileEnumerator::FileType>(
-          file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES));
+      (file_util::FileEnumerator::FILES |
+       file_util::FileEnumerator::DIRECTORIES));
 }
 
 PlatformFileError LocalFileUtil::GetLocalFilePath(