Fix DeleteCache on POSIX. It wasn't successfully deleting before.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2468 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 7 deletions

diff --git a/net/disk_cache/cache_util_posix.cc b/net/disk_cache/cache_util_posix.cc
index 80134b4..ca99cec 100644
--- a/net/disk_cache/cache_util_posix.cc
+++ b/net/disk_cache/cache_util_posix.cc
@@ -16,13 +16,16 @@ 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::FILES);
+  for (std::wstring file = iter.Next(); !file.empty(); file = iter.Next()) {
+    if (!file_util::Delete(file, /* recursive */ false))
+      NOTREACHED();
+  }
+
   if (remove_folder) {
-    file_util::Delete(path, false);
-  } else {
-    std::wstring name(path);
-    // TODO(rvargas): Fix this after file_util::delete is fixed.
-    // file_util::AppendToPath(&name, L"*");
-    file_util::Delete(name, true);
+    if (!file_util::Delete(path, /* recursive */ false))
+      NOTREACHED();
   }
 }
 
@@ -37,4 +40,3 @@ void WaitForPendingIO(int* num_pending_io) {
 }
 
 }  // namespace disk_cache
-