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 --- content/gpu/gpu_info_collector_win.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'content/gpu') diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 7269883..402a4b1 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -16,7 +16,6 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" @@ -78,10 +77,10 @@ content::GpuPerformanceStats RetrieveGpuPerformanceStats() { } // Find most recent formal assessment results. - base::FileEnumerator file_enumerator( + file_util::FileEnumerator file_enumerator( base::FilePath(winsat_results_path), false, // not recursive - base::FileEnumerator::FILES, + file_util::FileEnumerator::FILES, FILE_PATH_LITERAL("* * Formal.Assessment (*).WinSAT.xml")); base::FilePath current_results; -- cgit v1.1