diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 04:53:36 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 04:53:36 +0000 |
| commit | 25a4c1ccaee2b032ee368d733b79ac814efd7c37 (patch) | |
| tree | 589cd0233167acf4a3fe7bdaf50cea24ad505b7b /chrome_frame | |
| parent | aff39ac8a8ea09920b9180ebc09d72c15832f3ad (diff) | |
| download | chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.zip chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.tar.gz chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.tar.bz2 | |
Move FileEnumerator to its own file, do some refactoring.
It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked.
BUG=175002
Reland of 198820 and 298824
Original review = https://codereview.chromium.org/13165005
R=rvargas@chromium.org
Review URL: https://codereview.chromium.org/16392011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index f7d1abe..855a069 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -25,6 +25,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/path_service.h" @@ -332,9 +333,9 @@ class PageLoadTest : public testing::Test { virtual void SetUp() { // Initialize crash_dumps_dir_path_. PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dumps_dir_path_); - file_util::FileEnumerator enumerator(crash_dumps_dir_path_, - false, // not recursive - file_util::FileEnumerator::FILES); + base::FileEnumerator enumerator(crash_dumps_dir_path_, + false, // not recursive + base::FileEnumerator::FILES); for (base::FilePath path = enumerator.Next(); !path.value().empty(); path = enumerator.Next()) { if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp"))) @@ -411,9 +412,9 @@ class PageLoadTest : public testing::Test { NavigationMetrics* metrics) { int num_dumps = 0; - file_util::FileEnumerator enumerator(crash_dumps_dir_path_, - false, // not recursive - file_util::FileEnumerator::FILES); + base::FileEnumerator enumerator(crash_dumps_dir_path_, + false, // not recursive + base::FileEnumerator::FILES); for (base::FilePath path = enumerator.Next(); !path.value().empty(); path = enumerator.Next()) { if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp")) && |