diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:46:20 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:46:20 +0000 |
| commit | 9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb (patch) | |
| tree | 0818f910c522fb5bda00cab55412201251db32f7 /third_party/zlib/google | |
| parent | ad5b14e00b36aab6e2b2d6aba8477a5dd9a11998 (diff) | |
| download | chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.zip chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.tar.gz chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.tar.bz2 | |
Revert 198820 "Move FileEnumerator to its own file, do some refa..."
Broke both windows clobber and official builders' compile with this error:
771>Link:
771> Creating library ..\..\..\build\Release\lib\gcp_portmon64.lib and
object ..\..\..\build\Release\lib\gcp_portmon64.exp
771>base.lib(path_service.obj) : fatalerror LNK1112: module machine type 'X86'
conflicts with target machine type 'x64'
771>
771>Build FAILED.
> 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
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/14824006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/google')
| -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 2e46bed..e24449b 100644 --- a/third_party/zlib/google/zip.cc +++ b/third_party/zlib/google/zip.cc @@ -6,7 +6,6 @@ #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" @@ -138,8 +137,9 @@ bool ZipWithFilterCallback(const base::FilePath& src_dir, } bool success = true; - base::FileEnumerator file_enumerator(src_dir, true /* recursive */, - base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES); + file_util::FileEnumerator file_enumerator(src_dir, true /* recursive */, + file_util::FileEnumerator::FILES | + file_util::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 e5d800b..3f7911e 100644 --- a/third_party/zlib/google/zip_unittest.cc +++ b/third_party/zlib/google/zip_unittest.cc @@ -6,7 +6,6 @@ #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" @@ -74,8 +73,9 @@ class ZipTest : public PlatformTest { ASSERT_TRUE(file_util::PathExists(path)) << "no file " << path.value(); ASSERT_TRUE(zip::Unzip(path, test_dir_)); - base::FileEnumerator files(test_dir_, true, - base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES); + file_util::FileEnumerator files(test_dir_, true, + file_util::FileEnumerator::FILES | + file_util::FileEnumerator::DIRECTORIES); base::FilePath next_path = files.Next(); size_t count = 0; while (!next_path.value().empty()) { |