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

trunk/src/chrome/browser/printing/printing_layout_browsertest.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 "base/command_line.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/simple_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_view_manager.h"
@@ skipping 171 matching lines @@
  private:
   // Verifies that there is one .emf and one .prn file in the dump directory.
   // Returns the path of the .emf file and deletes the .prn file.
   std::wstring ScanFiles(const std::wstring& verification_name) {
     // Try to 10 seconds.
     std::wstring emf_file;
     std::wstring prn_file;
     bool found_emf = false;
     bool found_prn = false;
     for (int i = 0; i < 100; ++i) {
-      base::FileEnumerator enumerator(emf_path_, false,
-                                      base::FileEnumerator::FILES);
+      file_util::FileEnumerator enumerator(emf_path_, false,
+          file_util::FileEnumerator::FILES);
       emf_file.clear();
       prn_file.clear();
       found_emf = false;
       found_prn = false;
       base::FilePath file;
       while (!(file = enumerator.Next()).empty()) {
         std::wstring ext = file.Extension();
         if (base::strcasecmp(WideToUTF8(ext).c_str(), ".emf") == 0) {
           EXPECT_FALSE(found_emf) << "Found a leftover .EMF file: \"" <<
               emf_file << "\" and \"" << file.value() <<
@@ skipping 247 matching lines @@
 
     // Force a navigation elsewhere to verify that it's fine with it.
     url = test_server()->GetURL("files/printing/test1.html");
     ui_test_utils::NavigateToURL(browser(), url);
   }
   chrome::CloseWindow(browser());
   content::RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }