Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: trunk/src/chrome/browser/profiles/profile_manager.cc

Issue 14824006: Revert 198820 "Move FileEnumerator to its own file, do some refa..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/profiles/profile_manager.cc
===================================================================
--- trunk/src/chrome/browser/profiles/profile_manager.cc (revision 198849)
+++ trunk/src/chrome/browser/profiles/profile_manager.cc (working copy)
@@ -10,7 +10,6 @@
#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"
@@ -95,10 +94,14 @@
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;
}

Powered by Google App Engine
This is Rietveld 408576698