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

trunk/src/components/autofill/browser/data_driven_test.cc

 // Copyright (c) 2011 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 "components/autofill/browser/data_driven_test.h"
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
 namespace {
 
 // Reads |file| into |content|, and converts Windows line-endings to Unix ones.
 // Returns true on success.
@@ skipping 11 matching lines @@
                                         content.length());
   return write_size == static_cast<int>(content.length());
 }
 
 }  // namespace
 
 void DataDrivenTest::RunDataDrivenTest(
     const base::FilePath& input_directory,
     const base::FilePath& output_directory,
     const base::FilePath::StringType& file_name_pattern) {
-  base::FileEnumerator input_files(input_directory,
-                                   false,
-                                   base::FileEnumerator::FILES,
-                                   file_name_pattern);
+  file_util::FileEnumerator input_files(input_directory,
+                                        false,
+                                        file_util::FileEnumerator::FILES,
+                                        file_name_pattern);
 
   for (base::FilePath input_file = input_files.Next();
        !input_file.empty();
        input_file = input_files.Next()) {
     SCOPED_TRACE(input_file.BaseName().value());
 
     std::string input;
     ASSERT_TRUE(ReadFile(input_file, &input));
 
     std::string output;
@@ skipping 31 matching lines @@
   return test_data_dir_;
 }
 
 DataDrivenTest::DataDrivenTest() {
 }
 
 DataDrivenTest::~DataDrivenTest() {
 }
 
 }  // namespace autofill