From 9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb Mon Sep 17 00:00:00 2001 From: "dbeam@chromium.org" Date: Wed, 8 May 2013 05:46:20 +0000 Subject: 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 --- chrome/test/perf/page_cycler_test.cc | 9 ++++----- chrome/test/perf/startup_test.cc | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'chrome/test/perf') diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index b386fdd..9d13000 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -5,7 +5,6 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" @@ -69,8 +68,8 @@ void PopulateBufferCache(const base::FilePath& test_dir) { const base::FilePath svn_dir(FILE_PATH_LITERAL(".svn")); for (size_t idx = 0; idx < dirs.size(); ++idx) { - base::FileEnumerator dir_enumerator(dirs[idx], false, - base::FileEnumerator::DIRECTORIES); + file_util::FileEnumerator dir_enumerator(dirs[idx], false, + file_util::FileEnumerator::DIRECTORIES); base::FilePath path; for (path = dir_enumerator.Next(); !path.empty(); @@ -90,8 +89,8 @@ void PopulateBufferCache(const base::FilePath& test_dir) { std::vector::const_iterator iter; for (iter = dirs.begin(); iter != dirs.end(); ++iter) { - base::FileEnumerator file_enumerator(*iter, false, - base::FileEnumerator::FILES); + file_util::FileEnumerator file_enumerator(*iter, false, + file_util::FileEnumerator::FILES); base::FilePath path; for (path = file_enumerator.Next(); !path.empty(); diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc index c5d2083..f8ab9f8 100644 --- a/chrome/test/perf/startup_test.cc +++ b/chrome/test/perf/startup_test.cc @@ -4,7 +4,6 @@ #include "base/environment.h" #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -- cgit v1.1