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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/test/chromedriver/chrome/zip.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
« no previous file with comments | « trunk/src/chrome/test/automation/proxy_launcher.cc ('k') | trunk/src/chrome/test/chromedriver/util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/test/chromedriver/chrome/zip.cc
===================================================================
--- trunk/src/chrome/test/chromedriver/chrome/zip.cc (revision 198849)
+++ trunk/src/chrome/test/chromedriver/chrome/zip.cc (working copy)
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/logging.h"
#include "base/string16.h"
#include "base/string_util.h"
@@ -138,8 +137,9 @@
}
bool success = true;
- base::FileEnumerator file_enumerator(src_dir, true /* recursive */,
- base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator file_enumerator(src_dir, true /* recursive */,
+ file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
path = file_enumerator.Next()) {
if (!filter_cb.Run(path)) {
« no previous file with comments | « trunk/src/chrome/test/automation/proxy_launcher.cc ('k') | trunk/src/chrome/test/chromedriver/util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698