Move FileEnumerator to its own file, do some refactoring.

third_party/zlib/google/zip_unittest.cc

 // Copyright (c) 2011 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 <set>
 #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"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/zlib/google/zip.h"
 #include "third_party/zlib/google/zip_reader.h"
 
 namespace {
@@ skipping 47 matching lines @@
                      bool expect_hidden_files) {
     base::FilePath test_dir;
     ASSERT_TRUE(GetTestDataDirectory(&test_dir));
     TestUnzipFile(test_dir.Append(filename), expect_hidden_files);
   }
 
   void TestUnzipFile(const base::FilePath& path, bool expect_hidden_files) {
     ASSERT_TRUE(file_util::PathExists(path)) << "no file " << path.value();
     ASSERT_TRUE(zip::Unzip(path, test_dir_));
 
-    file_util::FileEnumerator files(test_dir_, true,
-        file_util::FileEnumerator::FILES |
-        file_util::FileEnumerator::DIRECTORIES);
+    base::FileEnumerator files(test_dir_, true,
+        base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
     base::FilePath next_path = files.Next();
     size_t count = 0;
     while (!next_path.value().empty()) {
       if (next_path.value().find(FILE_PATH_LITERAL(".svn")) ==
           base::FilePath::StringType::npos) {
         EXPECT_EQ(zip_contents_.count(next_path), 1U) <<
             "Couldn't find " << next_path.value();
         count++;
       }
       next_path = files.Next();
@@ skipping 109 matching lines @@
     EXPECT_TRUE(reader.LocateAndOpenEntry(zip_file_list_[i]));
     // Check the path in the entry just in case.
     const zip::ZipReader::EntryInfo* entry_info = reader.current_entry_info();
     EXPECT_EQ(entry_info->file_path(), zip_file_list_[i]);
   }
 }
 #endif  // defined(OS_POSIX)
 
 }  // namespace