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

trunk/src/chrome/browser/ui/pdf/pdf_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/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/hash.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 291 matching lines @@
   ASSERT_TRUE(pdf_test_server()->Start());
 
   NavigationController* controller =
       &(browser()->tab_strip_model()->GetActiveWebContents()->GetController());
   content::NotificationRegistrar registrar;
   registrar.Add(this,
                 content::NOTIFICATION_LOAD_STOP,
                 content::Source<NavigationController>(controller));
   std::string base_url = std::string("files/");
 
-  base::FileEnumerator file_enumerator(
+  file_util::FileEnumerator file_enumerator(
       ui_test_utils::GetTestFilePath(GetPDFTestDir(), base::FilePath()),
       false,
-      base::FileEnumerator::FILES,
+      file_util::FileEnumerator::FILES,
       FILE_PATH_LITERAL("*.pdf"));
   for (base::FilePath file_path = file_enumerator.Next();
        !file_path.empty();
        file_path = file_enumerator.Next()) {
     std::string filename = file_path.BaseName().MaybeAsASCII();
     ASSERT_FALSE(filename.empty());
 
 #if defined(OS_POSIX)
     if (filename == "sample.pdf")
       continue;  // Crashes on Mac and Linux.  http://crbug.com/63549
@@ skipping 80 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents(),
       "reloadPDF();"));
   observer.Wait();
 
   ASSERT_EQ("success",
             browser()->tab_strip_model()->GetActiveWebContents()->
                 GetURL().query());
 }
 
 }  // namespace