3 files changed, 8 insertions, 6 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index 00a67fab..a71c658 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -84,10 +84,10 @@ void DirectoryLister::ThreadMain() {
     return;
   }
 
-  file_util::FileEnumerator file_enum(dir_.ToWStringHack(), false,
+  file_util::FileEnumerator file_enum(dir_, false,
       file_util::FileEnumerator::FILES_AND_DIRECTORIES);
 
-  while (!canceled_ && !(file_enum.Next().empty())) {
+  while (!canceled_ && !(file_enum.Next().value().empty())) {
     file_enum.GetFindInfo(&e->data[e->count]);
 
     if (++e->count == kFilesPerEvent) {
diff --git a/net/disk_cache/cache_util_posix.cc b/net/disk_cache/cache_util_posix.cc
index ca99cec..24ef4d5 100644
--- a/net/disk_cache/cache_util_posix.cc
+++ b/net/disk_cache/cache_util_posix.cc
@@ -16,9 +16,10 @@ bool MoveCache(const std::wstring& from_path, const std::wstring& to_path) {
 }
 
 void DeleteCache(const std::wstring& path, bool remove_folder) {
-  file_util::FileEnumerator iter(path, /* recursive */ false,
+  file_util::FileEnumerator iter(FilePath::FromWStringHack(path),
+                                 /* recursive */ false,
                                  file_util::FileEnumerator::FILES);
-  for (std::wstring file = iter.Next(); !file.empty(); file = iter.Next()) {
+  for (FilePath file = iter.Next(); !file.value().empty(); file = iter.Next()) {
     if (!file_util::Delete(file, /* recursive */ false))
       NOTREACHED();
   }
diff --git a/net/tools/dump_cache/dump_files.cc b/net/tools/dump_cache/dump_files.cc
index 1275254..4425d61 100644
--- a/net/tools/dump_cache/dump_files.cc
+++ b/net/tools/dump_cache/dump_files.cc
@@ -277,9 +277,10 @@ int DumpHeaders(const std::wstring input_path) {
 
   std::wstring pattern(kDataPrefix);
   pattern.append(L"*");
-  file_util::FileEnumerator iter(input_path, false,
+  file_util::FileEnumerator iter(FilePath::FromWStringHack(input_path), false,
                                  file_util::FileEnumerator::FILES, pattern);
-  for (std::wstring file = iter.Next(); !file.empty(); file = iter.Next()) {
+  for (std::wstring file = iter.Next().ToWStringHack(); !file.empty();
+       file = iter.Next()) {
     DumpBlockHeader(file);
   }