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

trunk/src/net/base/directory_lister_unittest.cc

Index: trunk/src/net/base/directory_lister_unittest.cc
===================================================================
--- trunk/src/net/base/directory_lister_unittest.cc	(revision 198849)
+++ trunk/src/net/base/directory_lister_unittest.cc	(working copy)
@@ -5,7 +5,6 @@
 #include <list>
 #include <utility>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/file_util_icu.h"
@@ -64,17 +63,18 @@
            current < file_list_.size();
            previous++, current++) {
         // Directories should come before files.
-        if (file_list_[previous].IsDirectory() &&
-            !file_list_[current].IsDirectory()) {
+        if (file_util::FileEnumerator::IsDirectory(file_list_[previous]) &&
+            !file_util::FileEnumerator::IsDirectory(file_list_[current])) {
           continue;
         }
         EXPECT_NE(FILE_PATH_LITERAL(".."),
-                  file_list_[current].GetName().BaseName().value());
-        EXPECT_EQ(file_list_[previous].IsDirectory(),
-                  file_list_[current].IsDirectory());
+            file_util::FileEnumerator::GetFilename(
+                file_list_[current]).BaseName().value());
+        EXPECT_EQ(file_util::FileEnumerator::IsDirectory(file_list_[previous]),
+                  file_util::FileEnumerator::IsDirectory(file_list_[current]));
         EXPECT_TRUE(file_util::LocaleAwareCompareFilenames(
-            file_list_[previous].GetName(),
-            file_list_[current].GetName()));
+            file_util::FileEnumerator::GetFilename(file_list_[previous]),
+            file_util::FileEnumerator::GetFilename(file_list_[current])));
       }
     }
   }
@@ -87,7 +87,7 @@
   int error_;
   bool recursive_;
   bool quit_loop_after_each_file_;
-  std::vector<base::FileEnumerator::FileInfo> file_list_;
+  std::vector<file_util::FileEnumerator::FindInfo> file_list_;
   std::vector<base::FilePath> paths_;
 };