diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 22:51:31 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 22:51:31 +0000 |
| commit | fcb524ead399b591b4e6587c2fbe712e45126320 (patch) | |
| tree | 77da32bc4e3ab916de166e0f9e52e0ad61629efa /third_party/zlib | |
| parent | 3afef01773fcfe63523ebede8ad5a4dfed10088b (diff) | |
| download | chromium_src-fcb524ead399b591b4e6587c2fbe712e45126320.zip chromium_src-fcb524ead399b591b4e6587c2fbe712e45126320.tar.gz chromium_src-fcb524ead399b591b4e6587c2fbe712e45126320.tar.bz2 | |
Move FileEnumerator to its own file, do some refactoring.
It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked.
BUG=175002
R=rvargas@chromium.org
Review URL: https://codereview.chromium.org/13165005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/google/zip.cc | 6 | ||||
| -rw-r--r-- | third_party/zlib/google/zip_unittest.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/third_party/zlib/google/zip.cc b/third_party/zlib/google/zip.cc index e24449b..2e46bed 100644 --- a/third_party/zlib/google/zip.cc +++ b/third_party/zlib/google/zip.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/file_util.h" +#include "base/files/file_enumerator.h" #include "base/logging.h" #include "base/string16.h" #include "base/string_util.h" @@ -137,9 +138,8 @@ bool ZipWithFilterCallback(const base::FilePath& src_dir, } bool success = true; - file_util::FileEnumerator file_enumerator(src_dir, true /* recursive */, - file_util::FileEnumerator::FILES | - file_util::FileEnumerator::DIRECTORIES); + base::FileEnumerator file_enumerator(src_dir, true /* recursive */, + base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES); for (base::FilePath path = file_enumerator.Next(); !path.value().empty(); path = file_enumerator.Next()) { if (!filter_cb.Run(path)) { diff --git a/third_party/zlib/google/zip_unittest.cc b/third_party/zlib/google/zip_unittest.cc index 3f7911e..e5d800b 100644 --- a/third_party/zlib/google/zip_unittest.cc +++ b/third_party/zlib/google/zip_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "base/file_util.h" +#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" @@ -73,9 +74,8 @@ class ZipTest : public PlatformTest { ASSERT_TRUE(file_util::PathExists(path)) << "no file " << path.value(); ASSERT_TRUE(zip::Unzip(path, test_dir_)); - file_util::FileEnumerator files(test_dir_, true, - file_util::FileEnumerator::FILES | - file_util::FileEnumerator::DIRECTORIES); + base::FileEnumerator files(test_dir_, true, + base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES); base::FilePath next_path = files.Next(); size_t count = 0; while (!next_path.value().empty()) { |