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

trunk/src/chrome/browser/profiles/profile_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/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/deferred_sequenced_task_runner.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 64 matching lines @@
 
 // Profiles that should be deleted on shutdown.
 std::vector<base::FilePath>& ProfilesToDelete() {
   CR_DEFINE_STATIC_LOCAL(std::vector<base::FilePath>, profiles_to_delete, ());
   return profiles_to_delete;
 }
 
 int64 ComputeFilesSize(const base::FilePath& directory,
                        const base::FilePath::StringType& pattern) {
   int64 running_size = 0;
-  base::FileEnumerator iter(directory, false, base::FileEnumerator::FILES,
-                            pattern);
-  while (!iter.Next().empty())
-    running_size += iter.GetInfo().GetSize();
+  file_util::FileEnumerator iter(directory, false,
+                                 file_util::FileEnumerator::FILES,
+                                 pattern);
+  while (!iter.Next().empty()) {
+    file_util::FileEnumerator::FindInfo info;
+    iter.GetFindInfo(&info);
+    running_size += file_util::FileEnumerator::GetFilesize(info);
+  }
   return running_size;
 }
 
 // Simple task to log the size of the current profile.
 void ProfileSizeTask(const base::FilePath& path, int extension_count) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   int64 size = ComputeFilesSize(path, FILE_PATH_LITERAL("*"));
   int size_MB = static_cast<int>(size  / (1024 * 1024));
   UMA_HISTOGRAM_COUNTS_10000("Profile.TotalSize", size_MB);
@@ skipping 1070 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }