summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_service_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-08 04:53:36 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-08 04:53:36 +0000
commit25a4c1ccaee2b032ee368d733b79ac814efd7c37 (patch)
tree589cd0233167acf4a3fe7bdaf50cea24ad505b7b /chrome/browser/extensions/extension_service_unittest.cc
parentaff39ac8a8ea09920b9180ebc09d72c15832f3ad (diff)
downloadchromium_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/browser/extensions/extension_service_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_service_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 37056cc..7d32219 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -13,6 +13,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
+#include "base/files/file_enumerator.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_reader.h"
@@ -1354,8 +1355,8 @@ TEST_F(ExtensionServiceTest, CleanupOnStartup) {
// Wait for GarbageCollectExtensions task to complete.
loop_.RunUntilIdle();
- file_util::FileEnumerator dirs(extensions_install_dir_, false,
- file_util::FileEnumerator::DIRECTORIES);
+ base::FileEnumerator dirs(extensions_install_dir_, false,
+ base::FileEnumerator::DIRECTORIES);
size_t count = 0;
while (!dirs.Next().empty())
count++;