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

chrome/common/zip_unittest.cc

 // Copyright (c) 2011 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 <set>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
@@ skipping 35 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
     test_dir = test_dir.AppendASCII("zip");
     TestUnzipFile(test_dir.Append(filename), expect_hidden_files);
   }
 
   void TestUnzipFile(const FilePath& path, bool expect_hidden_files) {
     ASSERT_TRUE(file_util::PathExists(path)) << "no file " << path.value();
     ASSERT_TRUE(zip::Unzip(path, test_dir_));
 
     file_util::FileEnumerator files(test_dir_, true,
-        static_cast<file_util::FileEnumerator::FileType>(
-            file_util::FileEnumerator::FILES |
-            file_util::FileEnumerator::DIRECTORIES));
+        file_util::FileEnumerator::FILES |
+        file_util::FileEnumerator::DIRECTORIES);
     FilePath next_path = files.Next();
     size_t count = 0;
     while (!next_path.value().empty()) {
       if (next_path.value().find(FILE_PATH_LITERAL(".svn")) ==
           FilePath::StringType::npos) {
         EXPECT_EQ(zip_contents_.count(next_path), 1U) <<
             "Couldn't find " << next_path.value();
         count++;
       }
       next_path = files.Next();
@@ skipping 76 matching lines @@
 
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
 
   EXPECT_TRUE(zip::Zip(src_dir, zip_file, false));
   TestUnzipFile(zip_file, false);
 }
 
 }  // namespace