Index: base/file_util_unittest.cc |
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc |
index b471f8896034483513b49fb225323997297ee0d2..5a999839e79612fb5b3aca59c9be3149a6ad2e36 100644 |
--- a/base/file_util_unittest.cc |
+++ b/base/file_util_unittest.cc |
@@ -130,10 +130,8 @@ void ChangePosixFilePermissions(const FilePath& path, |
const wchar_t bogus_content[] = L"I'm cannon fodder."; |
-const file_util::FileEnumerator::FileType FILES_AND_DIRECTORIES = |
- static_cast<file_util::FileEnumerator::FileType>( |
- file_util::FileEnumerator::FILES | |
- file_util::FileEnumerator::DIRECTORIES); |
+const int FILES_AND_DIRECTORIES = |
+ file_util::FileEnumerator::FILES | file_util::FileEnumerator::DIRECTORIES; |
// file_util winds up using autoreleased objects on the Mac, so this needs |
// to be a PlatformTest |
@@ -1867,8 +1865,7 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { |
// Test an empty directory, non-recursively, including "..". |
file_util::FileEnumerator f0_dotdot(temp_dir_.path(), false, |
- static_cast<file_util::FileEnumerator::FileType>( |
- FILES_AND_DIRECTORIES | file_util::FileEnumerator::INCLUDE_DOT_DOT)); |
+ FILES_AND_DIRECTORIES | file_util::FileEnumerator::INCLUDE_DOT_DOT); |
EXPECT_EQ(temp_dir_.path().Append(FILE_PATH_LITERAL("..")).value(), |
f0_dotdot.Next().value()); |
EXPECT_EQ(FILE_PATH_LITERAL(""), |
@@ -1923,11 +1920,9 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { |
EXPECT_EQ(c2_non_recursive.size(), 2); |
// Only enumerate directories, non-recursively, including "..". |
- file_util::FileEnumerator f2_dotdot( |
- temp_dir_.path(), false, |
- static_cast<file_util::FileEnumerator::FileType>( |
- file_util::FileEnumerator::DIRECTORIES | |
- file_util::FileEnumerator::INCLUDE_DOT_DOT)); |
+ file_util::FileEnumerator f2_dotdot(temp_dir_.path(), false, |
+ file_util::FileEnumerator::DIRECTORIES | |
+ file_util::FileEnumerator::INCLUDE_DOT_DOT); |
FindResultCollector c2_dotdot(f2_dotdot); |
EXPECT_TRUE(c2_dotdot.HasFile(dir1)); |
EXPECT_TRUE(c2_dotdot.HasFile(dir2)); |