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

trunk/src/chrome/browser/component_updater/swiftshader_component_installer.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 "chrome/browser/component_updater/swiftshader_component_installer.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/cpu.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
@@ skipping 34 matching lines @@
 
 // SwiftShader has version encoded in the path itself
 // so we need to enumerate the directories to find the full path.
 // On success it returns something like:
 // <profile>\AppData\Local\Google\Chrome\User Data\SwiftShader\10.3.44.555\.
 bool GetLatestSwiftShaderDirectory(base::FilePath* result,
                                    Version* latest,
                                    std::vector<base::FilePath>* older_dirs) {
   base::FilePath base_dir = GetSwiftShaderBaseDirectory();
   bool found = false;
-  base::FileEnumerator
-      file_enumerator(base_dir, false, base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator
+      file_enumerator(base_dir, false, file_util::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
        path = file_enumerator.Next()) {
     Version version(path.BaseName().MaybeAsASCII());
     if (!version.IsValid())
       continue;
     if (version.CompareTo(*latest) > 0 &&
         file_util::PathExists(path.Append(kSwiftShaderEglName)) &&
         file_util::PathExists(path.Append(kSwiftShaderGlesName))) {
       if (found && older_dirs)
           older_dirs->push_back(*result);
@@ skipping 150 matching lines @@
 void RegisterSwiftShaderComponent(ComponentUpdateService* cus) {
 #if defined(ENABLE_SWIFTSHADER)
   base::CPU cpu;
 
   if (!cpu.has_sse2())
     return;
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&RegisterSwiftShaderPath, cus));
 #endif
 }