// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "net/disk_cache/cache_util.h"

#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"

namespace disk_cache {

bool MoveCache(const FilePath& from_path, const FilePath& to_path) {
  // Just use the version from base.
  return file_util::Move(from_path, to_path);
}

void DeleteCache(const FilePath& path, bool remove_folder) {
  file_util::FileEnumerator iter(path,
                                 /* recursive */ false,
                                 file_util::FileEnumerator::FILES);
  for (FilePath file = iter.Next(); !file.value().empty(); file = iter.Next()) {
    if (!file_util::Delete(file, /* recursive */ false)) {
      LOG(WARNING) << "Unable to delete cache.";
      return;
    }
  }

  if (remove_folder) {
    if (!file_util::Delete(path, /* recursive */ false)) {
      LOG(WARNING) << "Unable to delete cache folder.";
      return;
    }
  }
}

bool DeleteCacheFile(const FilePath& name) {
  return file_util::Delete(name, false);
}

}  // namespace disk_cache

// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "net/disk_cache/cache_util.h"

#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"

namespace disk_cache {

bool MoveCache(const FilePath& from_path, const FilePath& to_path) {
  // Just use the version from base.
  return file_util::Move(from_path, to_path);
}

void DeleteCache(const FilePath& path, bool remove_folder) {
  file_util::FileEnumerator iter(path,
                                 /* recursive */ false,
                                 file_util::FileEnumerator::FILES);
  for (FilePath file = iter.Next(); !file.value().empty(); file = iter.Next()) {
    if (!file_util::Delete(file, /* recursive */ false))
      NOTREACHED();
  }

  if (remove_folder) {
    if (!file_util::Delete(path, /* recursive */ false))
      NOTREACHED();
  }
}

bool DeleteCacheFile(const FilePath& name) {
  return file_util::Delete(name, false);
}

}  // namespace disk_cache

--- 
+++ 
@@ -20,13 +20,17 @@
                                  /* recursive */ false,
                                  file_util::FileEnumerator::FILES);
   for (FilePath file = iter.Next(); !file.value().empty(); file = iter.Next()) {
-    if (!file_util::Delete(file, /* recursive */ false))
-      NOTREACHED();
+    if (!file_util::Delete(file, /* recursive */ false)) {
+      LOG(WARNING) << "Unable to delete cache.";
+      return;
+    }
   }
 
   if (remove_folder) {
-    if (!file_util::Delete(path, /* recursive */ false))
-      NOTREACHED();
+    if (!file_util::Delete(path, /* recursive */ false)) {
+      LOG(WARNING) << "Unable to delete cache folder.";
+      return;
+    }
   }
 }
 
Change NOTREACHED for a LOG(WARNING) when we can't delete
the cache. This should help the unit tests.

BUG:38562
Review URL: http://codereview.chromium.org/1594002

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@43446 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
