Revert 198820 "Move FileEnumerator to its own file, do some refa..."

trunk/src/content/gpu/gpu_info_collector_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/gpu/gpu_info_collector.h"
 
 // This has to be included before windows.h.
 #include "third_party/re2/re2/re2.h"
 
 #include <windows.h>
 #include <d3d9.h>
 #include <d3d11.h>
 #include <dxgi.h>
 #include <setupapi.h>
 
 #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"
 #include "base/metrics/histogram.h"
 #include "base/scoped_native_library.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
@@ skipping 41 matching lines @@
   DWORD size = ExpandEnvironmentStrings(
       L"%WinDir%\\Performance\\WinSAT\\DataStore\\",
       winsat_results_path, MAX_PATH);
   if (size == 0 || size > MAX_PATH) {
     LOG(ERROR) << "The path to the WinSAT results is too long: "
                << size << " chars.";
     return stats;
   }
 
   // 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;
   for (base::FilePath results = file_enumerator.Next(); !results.empty();
        results = file_enumerator.Next()) {
     // The filenames start with the date and time as yyyy-mm-dd hh.mm.ss.xxx,
     // so the greatest file lexicographically is also the most recent file.
     if (base::FilePath::CompareLessIgnoreCase(current_results.value(),
                                               results.value()))
       current_results = results;
@@ skipping 540 matching lines @@
     basic_gpu_info->software_rendering = true;
     return;
   }
 
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 
   basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics;
 }
 
 }  // namespace gpu_info_collector