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

to remove static_cast<> in the callers.

BUG=139130
TEST=try bots

Review URL: https://chromiumcodereview.appspot.com/10855002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151192 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 18 insertions, 28 deletions

diff --git a/webkit/fileapi/file_system_database_test_helper.cc b/webkit/fileapi/file_system_database_test_helper.cc
index 28951d08..838173a 100644
--- a/webkit/fileapi/file_system_database_test_helper.cc
+++ b/webkit/fileapi/file_system_database_test_helper.cc
@@ -19,11 +19,9 @@ void CorruptDatabase(const FilePath& db_path,
                      leveldb::FileType type,
                      ptrdiff_t offset,
                      size_t size) {
-  file_util::FileEnumerator file_enum(
-      db_path, false /* recursive */,
-      static_cast<file_util::FileEnumerator::FileType>(
-          file_util::FileEnumerator::DIRECTORIES |
-          file_util::FileEnumerator::FILES));
+  file_util::FileEnumerator file_enum(db_path, false /* not recursive */,
+      file_util::FileEnumerator::DIRECTORIES |
+      file_util::FileEnumerator::FILES);
   FilePath file_path;
   FilePath picked_file_path;
   uint64 picked_file_number = kuint64max;
diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc
index 16ec2f8..4023c5a 100644
--- a/webkit/fileapi/file_system_directory_database.cc
+++ b/webkit/fileapi/file_system_directory_database.cc
@@ -273,10 +273,9 @@ bool DatabaseCheckHelper::ScanDirectory() {
 
     file_util::FileEnumerator file_enum(
         dir_path.empty() ? path_ : path_.Append(dir_path),
-        false /* recursive */,
-        static_cast<file_util::FileEnumerator::FileType>(
-            file_util::FileEnumerator::DIRECTORIES |
-            file_util::FileEnumerator::FILES));
+        false /* not recursive */,
+        file_util::FileEnumerator::DIRECTORIES |
+        file_util::FileEnumerator::FILES);
 
     FilePath absolute_file_path;
     while (!(absolute_file_path = file_enum.Next()).empty()) {
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index acd4fca..d3e6303 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -323,10 +323,8 @@ TEST_F(IsolatedFileUtilTest, ReadDirectoryTest) {
     EntryMap expected_entry_map;
 
     FileEnumerator file_enum(
-        GetTestCasePlatformPath(test_case.path),
-        false /* recursive */,
-        static_cast<file_util::FileEnumerator::FileType>(
-            FileEnumerator::FILES | FileEnumerator::DIRECTORIES));
+        GetTestCasePlatformPath(test_case.path), false /* not recursive */,
+        FileEnumerator::FILES | FileEnumerator::DIRECTORIES);
     FilePath current;
     while (!(current = file_enum.Next()).empty()) {
       FileEnumerator::FindInfo file_info;
diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc
index 2bfe172..3274171 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 |
+      file_util::FileEnumerator::DIRECTORIES);
 }
 
 PlatformFileError LocalFileUtil::GetLocalFilePath(
diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc
index 6a9d5cd..995a9e9 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 |
+      file_util::FileEnumerator::DIRECTORIES);
 }
 
 PlatformFileError NativeFileUtil::Touch(
diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc
index b23ba78..9db406d 100644
--- a/webkit/fileapi/obfuscated_file_util.cc
+++ b/webkit/fileapi/obfuscated_file_util.cc
@@ -996,9 +996,8 @@ bool ObfuscatedFileUtil::MigrateFromOldSandbox(
     return false;
 
   file_util::FileEnumerator file_enum(src_root, true,
-      static_cast<file_util::FileEnumerator::FileType>(
-          file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES));
+      file_util::FileEnumerator::FILES |
+      file_util::FileEnumerator::DIRECTORIES);
   FilePath src_full_path;
   size_t root_path_length = src_root.value().length() + 1;  // +1 for the slash
   while (!(src_full_path = file_enum.Next()).empty()) {