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

trunk/src/chrome/browser/history/text_database_manager.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/browser/history/text_database_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/metrics/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/visit_database.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 130 matching lines @@
 
 void TextDatabaseManager::InitDBList() {
   if (present_databases_loaded_)
     return;
 
   present_databases_loaded_ = true;
 
   // Find files on disk matching our pattern so we can quickly test for them.
   base::FilePath::StringType filepattern(TextDatabase::file_base());
   filepattern.append(FILE_PATH_LITERAL("*"));
-  base::FileEnumerator enumerator(
-      dir_, false, base::FileEnumerator::FILES, filepattern);
+  file_util::FileEnumerator enumerator(
+      dir_, false, file_util::FileEnumerator::FILES, filepattern);
   base::FilePath cur_file;
   while (!(cur_file = enumerator.Next()).empty()) {
     // Convert to the number representing this file.
     TextDatabase::DBIdent id = TextDatabase::FileNameToID(cur_file);
     if (id)  // Will be 0 on error.
       present_databases_.insert(id);
   }
 }
 
 void TextDatabaseManager::AddPageURL(const GURL& url,
@@ skipping 402 matching lines @@
   while (i != recent_changes_.rend() && i->second.Expired(now)) {
     AddPageData(i->first, i->second.url_id(), i->second.visit_id(),
                 i->second.visit_time(), i->second.title(), i->second.body());
     i = recent_changes_.Erase(i);
   }
 
   ScheduleFlushOldChanges();
 }
 
 }  // namespace history