commit 0e1a70b56fd31570056c7ff98106b41e186bcb5d
author haruki@chromium.org <haruki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sun Aug 12 10:57:23 2012 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 13:13:16 2020 +0900
tree 7d071d1d4585c2152f481413458a4c3017b2551d
parent 7300bb1d5dc406d2ddd9f5ef85fed129e5e5f884

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


CrOS-Libchrome-Original-Commit: 84c3f1642184211bcf188e8f9ed763603af57511

base/file_util_unittest.cc

diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index b471f88..5a99983 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -130,10 +130,8 @@
 
 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 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 @@
   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));