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

trunk/src/chrome/test/automation/proxy_launcher.cc

 // Copyright (c) 2012 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 "chrome/test/automation/proxy_launcher.h"
 
 #include <vector>
 
 #include "base/environment.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 21 matching lines @@
 // Copies the contents of the given source directory to the given dest
 // directory. This is somewhat different than CopyDirectory in base which will
 // copies "source/" to "dest/source/". This version will copy "source/*" to
 // "dest/*", overwriting existing files as necessary.
 //
 // This also kicks the files out of the memory cache for the startup tests.
 // TODO(brettw) bug 237904: This is the wrong place for this code. It means all
 // startup tests other than the "cold" ones run more slowly than necessary.
 bool CopyDirectoryContentsNoCache(const base::FilePath& source,
                                   const base::FilePath& dest) {
-  base::FileEnumerator en(source, false,
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator en(source, false,
+      file_util::FileEnumerator::FILES |
+      file_util::FileEnumerator::DIRECTORIES);
   for (base::FilePath cur = en.Next(); !cur.empty(); cur = en.Next()) {
-    base::FileEnumerator::FileInfo info = en.GetInfo();
-    if (info.IsDirectory()) {
+    file_util::FileEnumerator::FindInfo info;
+    en.GetFindInfo(&info);
+    if (file_util::FileEnumerator::IsDirectory(info)) {
       if (!file_util::CopyDirectory(cur, dest, true))
         return false;
     } else {
       if (!file_util::CopyFile(cur, dest.Append(cur.BaseName())))
         return false;
     }
   }
 
   // Kick out the profile files, this must happen after SetUp which creates the
   // profile. It might be nicer to use EvictFileFromSystemCacheWrapper from
   // UITest which will retry on failure.
-  base::FileEnumerator kickout(dest, true, base::FileEnumerator::FILES);
+  file_util::FileEnumerator kickout(dest, true,
+                                    file_util::FileEnumerator::FILES);
   for (base::FilePath cur = kickout.Next(); !cur.empty(); cur = kickout.Next())
     base::EvictFileFromSystemCacheWithRetry(cur);
   return true;
 }
 
 // We want to have a current history database when we start the browser so
 // things like the NTP will have thumbnails.  This method updates the dates
 // in the history to be more recent.
 void UpdateHistoryDates(const base::FilePath& user_data_dir) {
   // Migrate the times in the segment_usage table to yesterday so we get
@@ skipping 548 matching lines @@
   return LaunchBrowserAndServer(state, wait_for_initial_loads);
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }