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

webkit/fileapi/native_file_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/native_file_util.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 21 matching lines @@
     // Keep the directory permissions unchanged on non-Chrome OS platforms.
     return true;
 }
 
 }  // namespace
 
 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_));
 #endif  // defined(OS_WIN)
   }
 
   ~NativeFileEnumerator() {}
 
   virtual FilePath Next() OVERRIDE;
   virtual int64 Size() OVERRIDE;
@@ skipping 98 matching lines @@
   if (!file_util::PathExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   if (!file_util::GetFileInfo(path, file_info))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 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(
     const FilePath& path,
     const base::Time& last_access_time,
     const base::Time& last_modified_time) {
   if (!file_util::TouchFile(
           path, last_access_time, last_modified_time))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
@@ skipping 65 matching lines @@
   if (!file_util::IsDirectoryEmpty(path)) {
     // TODO(dmikurube): Check if this error code is appropriate.
     return base::PLATFORM_FILE_ERROR_NOT_EMPTY;
   }
   if (!file_util::Delete(path, false))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace fileapi