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

trunk/src/chrome/browser/ui/pdf/pdf_browsertest.cc

Index: trunk/src/chrome/browser/ui/pdf/pdf_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/ui/pdf/pdf_browsertest.cc	(revision 198849)
+++ trunk/src/chrome/browser/ui/pdf/pdf_browsertest.cc	(working copy)
@@ -3,7 +3,6 @@
 // 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"
@@ -315,10 +314,10 @@
                 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();
Property changes on: trunk/src/chrome/browser/ui/pdf/pdf_browsertest.cc
___________________________________________________________________
Deleted: svn:mergeinfo