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

webkit/fileapi/isolated_file_util_unittest.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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 307 matching lines @@
     SCOPED_TRACE(testing::Message() << "Testing RegularTestCases " << i
                  << ": " << test_case.path);
 
     // Read entries in the directory to construct the expected results map.
     typedef std::map<FilePath::StringType, base::FileUtilProxy::Entry> EntryMap;
     EntryMap expected_entry_map;
 
     FileEnumerator file_enum(
         GetTestCasePlatformPath(test_case.path),
         false /* recursive */,
-        static_cast<file_util::FileEnumerator::FileType>(
-            FileEnumerator::FILES | FileEnumerator::DIRECTORIES));
+        (FileEnumerator::FILES | FileEnumerator::DIRECTORIES));

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

nit: remove extra parents around arg 3.

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

Done.

     FilePath current;
     while (!(current = file_enum.Next()).empty()) {
       FileEnumerator::FindInfo file_info;
       file_enum.GetFindInfo(&file_info);
       base::FileUtilProxy::Entry entry;
       entry.is_directory = FileEnumerator::IsDirectory(file_info);
       entry.name = current.BaseName().value();
       entry.size = FileEnumerator::GetFilesize(file_info);
       entry.last_modified_time = FileEnumerator::GetLastModifiedTime(file_info);
       expected_entry_map[entry.name] = entry;
@@ skipping 166 matching lines @@
     EXPECT_EQ(base::PLATFORM_FILE_OK,
               file_util()->Truncate(GetOperationContext().get(), url, 999));
     ASSERT_EQ(base::PLATFORM_FILE_OK,
               file_util()->GetFileInfo(GetOperationContext().get(), url,
                                        &info, &platform_path));
     EXPECT_EQ(999, info.size);
   }
 }
 
 }  // namespace fileapi