Index: base/file_util_unittest.cc |
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc |
index 25e2f40f310555757cbe2ff95137b8ce1575c65f..459051b3a4c03e0dc63de2100c03c8dfe0ea46e1 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 |
@@ -1862,9 +1860,9 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { |
EXPECT_EQ(f0.Next().value(), FILE_PATH_LITERAL("")); |
// 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)); |
+ file_util::FileEnumerator f0_dotdot( |
+ temp_dir_.path(), false, |
+ (FILES_AND_DIRECTORIES | file_util::FileEnumerator::INCLUDE_DOT_DOT)); |
jar (doing other things)
2012/08/06 18:27:02
nit: I don't see value in the paren around this or
Haruki Sato
2012/08/06 23:22:18
Done.
|
EXPECT_EQ(temp_dir_.path().Append(FILE_PATH_LITERAL("..")).value(), |
f0_dotdot.Next().value()); |
EXPECT_EQ(FILE_PATH_LITERAL(""), |
@@ -1921,9 +1919,8 @@ TEST_F(FileUtilTest, FileEnumeratorTest) { |
// 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::DIRECTORIES | |
+ file_util::FileEnumerator::INCLUDE_DOT_DOT)); |
FindResultCollector c2_dotdot(f2_dotdot); |
EXPECT_TRUE(c2_dotdot.HasFile(dir1)); |
EXPECT_TRUE(c2_dotdot.HasFile(dir2)); |