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

trunk/src/chrome/tools/profiles/generate_profile.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.
 
 // This program generates a user profile and history by randomly generating
 // data and feeding it to the history service.
 
 #include "chrome/tools/profiles/thumbnail-inl.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_service.h"
@@ skipping 260 matching lines @@
     page_id += batch_size;
   }
 
   printf("Writing to disk\n");
 
   profile.DestroyTopSites();
   profile.DestroyHistoryService();
 
   message_loop.RunUntilIdle();
 
-  base::FileEnumerator file_iterator(profile.GetPath(), false,
-                                     base::FileEnumerator::FILES);
+  file_util::FileEnumerator file_iterator(profile.GetPath(), false,
+      file_util::FileEnumerator::FILES);
   base::FilePath path = file_iterator.Next();
   while (!path.empty()) {
     base::FilePath dst_file = dst_dir.Append(path.BaseName());
     file_util::Delete(dst_file, false);
     printf("Copying file %" PRFilePath " to "
            "%" PRFilePath "\n", path.value().c_str(),
            dst_file.value().c_str());
     if (!file_util::CopyFile(path, dst_file)) {
       PLOG(ERROR) << "Copying file failed";
       return -1;
     }
     path = file_iterator.Next();
   }
 
   return 0;
 }