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

trunk/src/chrome/test/webdriver/webdriver_util.cc

Index: trunk/src/chrome/test/webdriver/webdriver_util.cc
===================================================================
--- trunk/src/chrome/test/webdriver/webdriver_util.cc	(revision 198849)
+++ trunk/src/chrome/test/webdriver/webdriver_util.cc	(working copy)
@@ -7,7 +7,6 @@
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
@@ -373,8 +372,9 @@
     return false;
   }
 
-  base::FileEnumerator enumerator(unzip_dir, false /* recursive */,
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator enumerator(unzip_dir, false /* recursive */,
+      file_util::FileEnumerator::FILES |
+      file_util::FileEnumerator::DIRECTORIES);
   base::FilePath first_file = enumerator.Next();
   if (first_file.empty()) {
     *error_msg = "Zip contained 0 files";