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

trunk/src/webkit/dom_storage/dom_storage_context.cc

Index: trunk/src/webkit/dom_storage/dom_storage_context.cc
===================================================================
--- trunk/src/webkit/dom_storage/dom_storage_context.cc	(revision 198849)
+++ trunk/src/webkit/dom_storage/dom_storage_context.cc	(working copy)
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/time.h"
@@ -19,6 +18,8 @@
 #include "webkit/dom_storage/session_storage_database.h"
 #include "webkit/quota/special_storage_policy.h"
 
+using file_util::FileEnumerator;
+
 namespace dom_storage {
 
 static const int kSessionStoraceScavengingSeconds = 60;
@@ -86,17 +87,18 @@
     bool include_file_info) {
   if (localstorage_directory_.empty())
     return;
-  base::FileEnumerator enumerator(localstorage_directory_, false,
-                                  base::FileEnumerator::FILES);
+  FileEnumerator enumerator(localstorage_directory_, false,
+                            FileEnumerator::FILES);
   for (base::FilePath path = enumerator.Next(); !path.empty();
        path = enumerator.Next()) {
     if (path.MatchesExtension(DomStorageArea::kDatabaseFileExtension)) {
       LocalStorageUsageInfo info;
       info.origin = DomStorageArea::OriginFromDatabaseFileName(path);
       if (include_file_info) {
-        base::FileEnumerator::FileInfo find_info = enumerator.GetInfo();
-        info.data_size = find_info.GetSize();
-        info.last_modified = find_info.GetLastModifiedTime();
+        FileEnumerator::FindInfo find_info;
+        enumerator.GetFindInfo(&find_info);
+        info.data_size = FileEnumerator::GetFilesize(find_info);
+        info.last_modified = FileEnumerator::GetLastModifiedTime(find_info);
       }
       infos->push_back(info);
     }