Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1768)

Unified Diff: chrome/common/zip_unittest.cc

Issue 10855002: Change the type of file_type parameter to int, as the parameter actually takes or-ed bitmasks, (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/zip_unittest.cc
diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc
index 6c857e17480699e6ac248cafb5420efd053c161d..6fe8089a32c272d7204ef5ec76eaa207783a9878 100644
--- a/chrome/common/zip_unittest.cc
+++ b/chrome/common/zip_unittest.cc
@@ -53,9 +53,8 @@ class ZipTest : public PlatformTest {
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()) {

Powered by Google App Engine
This is Rietveld 408576698