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 --- net/tools/quic/quic_in_memory_cache.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'net/tools/quic/quic_in_memory_cache.cc') diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc index 7a1906b..9d086e2 100644 --- a/net/tools/quic/quic_in_memory_cache.cc +++ b/net/tools/quic/quic_in_memory_cache.cc @@ -5,11 +5,11 @@ #include "net/tools/quic/quic_in_memory_cache.h" #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/stl_util.h" using base::FilePath; using base::StringPiece; +using file_util::FileEnumerator; using std::string; // Specifies the directory used during QuicInMemoryCache @@ -119,9 +119,9 @@ QuicInMemoryCache::QuicInMemoryCache() { << FLAGS_quic_in_memory_cache_dir; FilePath directory(FLAGS_quic_in_memory_cache_dir); - base::FileEnumerator file_list(directory, - true, - base::FileEnumerator::FILES); + FileEnumerator file_list(directory, + true, + FileEnumerator::FILES); FilePath file = file_list.Next(); while (!file.empty()) { -- cgit v1.1