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

trunk/src/third_party/zlib/google/zip_unittest.cc

Index: trunk/src/third_party/zlib/google/zip_unittest.cc
===================================================================
--- trunk/src/third_party/zlib/google/zip_unittest.cc	(revision 198849)
+++ trunk/src/third_party/zlib/google/zip_unittest.cc	(working copy)
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
@@ -74,8 +73,9 @@
     ASSERT_TRUE(file_util::PathExists(path)) << "no file " << path.value();
     ASSERT_TRUE(zip::Unzip(path, test_dir_));
 
-    base::FileEnumerator files(test_dir_, true,
-        base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+    file_util::FileEnumerator files(test_dir_, true,
+        file_util::FileEnumerator::FILES |
+        file_util::FileEnumerator::DIRECTORIES);
     base::FilePath next_path = files.Next();
     size_t count = 0;
     while (!next_path.value().empty()) {