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

base/file_util_posix.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 "base/file_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
@@ skipping 205 matching lines @@
     return ret;
   }
   if (!S_ISDIR(file_info.st_mode))
     return (unlink(path_str) == 0);
   if (!recursive)
     return (rmdir(path_str) == 0);
 
   bool success = true;
   std::stack<std::string> directories;
   directories.push(path.value());
-  FileEnumerator traversal(path, true, static_cast<FileEnumerator::FileType>(
-        FileEnumerator::FILES | FileEnumerator::DIRECTORIES |
-        FileEnumerator::SHOW_SYM_LINKS));
+  FileEnumerator traversal(
+      path,

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

nit: IMO, put lines 227 and 228 on line 226.

It is probably fine to start the third arg on a new line (indented 4 spaces, as
you did).

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

Done.
Thank you for the thourough review.

+      true,
+      (FileEnumerator::FILES | FileEnumerator::DIRECTORIES |
+       FileEnumerator::SHOW_SYM_LINKS));
   for (FilePath current = traversal.Next(); success && !current.empty();
        current = traversal.Next()) {
     FileEnumerator::FindInfo info;
     traversal.GetFindInfo(&info);
 
     if (S_ISDIR(info.stat.st_mode))
       directories.push(current.value());
     else
       success = (unlink(current.value().c_str()) == 0);
   }
@@ skipping 65 matching lines @@
   }
   FilePath real_from_path = from_path;
   if (!AbsolutePath(&real_from_path))
     return false;
   if (real_to_path.value().size() >= real_from_path.value().size() &&
       real_to_path.value().compare(0, real_from_path.value().size(),
       real_from_path.value()) == 0)
     return false;
 
   bool success = true;
-  FileEnumerator::FileType traverse_type =
-      static_cast<FileEnumerator::FileType>(FileEnumerator::FILES |
-      FileEnumerator::SHOW_SYM_LINKS);
+  int traverse_type = FileEnumerator::FILES | FileEnumerator::SHOW_SYM_LINKS;
   if (recursive)
-    traverse_type = static_cast<FileEnumerator::FileType>(
-        traverse_type | FileEnumerator::DIRECTORIES);
+    traverse_type |= FileEnumerator::DIRECTORIES;
   FileEnumerator traversal(from_path, recursive, traverse_type);
 
   // We have to mimic windows behavior here. |to_path| may not exist yet,
   // start the loop with |to_path|.
   FileEnumerator::FindInfo info;
   FilePath current = from_path;
   if (stat(from_path.value().c_str(), &info.stat) < 0) {
     DLOG(ERROR) << "CopyDirectory() couldn't stat source directory: "
                 << from_path.value() << " errno = " << errno;
     success = false;
@@ skipping 402 matching lines @@
   base::ThreadRestrictions::AssertIOAllowed();
   int ret = chdir(path.value().c_str());
   return !ret;
 }
 
 ///////////////////////////////////////////////
 // FileEnumerator
 
 FileEnumerator::FileEnumerator(const FilePath& root_path,
                                bool recursive,
-                               FileType file_type)
+                               int file_type)
     : current_directory_entry_(0),
       root_path_(root_path),
       recursive_(recursive),
       file_type_(file_type) {
   // INCLUDE_DOT_DOT must not be specified if recursive.
   DCHECK(!(recursive && (INCLUDE_DOT_DOT & file_type_)));
   pending_paths_.push(root_path);
 }
 
 FileEnumerator::FileEnumerator(const FilePath& root_path,
                                bool recursive,
-                               FileType file_type,
+                               int file_type,
                                const FilePath::StringType& pattern)
     : current_directory_entry_(0),
       root_path_(root_path),
       recursive_(recursive),
       file_type_(file_type),
       pattern_(root_path.Append(pattern).value()) {
   // INCLUDE_DOT_DOT must not be specified if recursive.
   DCHECK(!(recursive && (INCLUDE_DOT_DOT & file_type_)));
   // The Windows version of this code appends the pattern to the root_path,
   // potentially only matching against items in the top-most directory.
@@ skipping 386 matching lines @@
 
     allowed_group_ids.insert(group_record->gr_gid);
   }
 
   return VerifyPathControlledByUser(
       kFileSystemRoot, path, kRootUid, allowed_group_ids);
 }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 }  // namespace file_util