From dde46b66c618a3ab242ddfbceb0290699a32012c Mon Sep 17 00:00:00 2001
From: "thestig@chromium.org"
 <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 6 May 2010 21:56:40 +0000
Subject: Windows: Make file_util::Delete("c:\\foo_dir", false) work correctly.
 Add more unit tests for Delete.

BUG=42374
TEST=included
Review URL: http://codereview.chromium.org/1763008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46633 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/installer/util/copy_tree_work_item_unittest.cc   | 2 +-
 chrome/installer/util/create_dir_work_item_unittest.cc  | 2 +-
 chrome/installer/util/delete_tree_work_item_unittest.cc | 2 +-
 chrome/installer/util/helper_unittest.cc                | 2 +-
 chrome/installer/util/lzma_util_unittest.cc             | 2 +-
 chrome/installer/util/move_tree_work_item_unittest.cc   | 2 +-
 chrome/installer/util/shell_util_unittest.cc            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'chrome/installer')

diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc
index bc187e61..d24d4ae 100644
--- a/chrome/installer/util/copy_tree_work_item_unittest.cc
+++ b/chrome/installer/util/copy_tree_work_item_unittest.cc
@@ -42,7 +42,7 @@ namespace {
     virtual void TearDown() {
       logging::CloseLogFile();
       // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, false));
+      ASSERT_TRUE(file_util::Delete(test_dir_, true));
       ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
diff --git a/chrome/installer/util/create_dir_work_item_unittest.cc b/chrome/installer/util/create_dir_work_item_unittest.cc
index 49f9460..4c8df50 100644
--- a/chrome/installer/util/create_dir_work_item_unittest.cc
+++ b/chrome/installer/util/create_dir_work_item_unittest.cc
@@ -27,7 +27,7 @@ namespace {
     }
     virtual void TearDown() {
       // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, false));
+      ASSERT_TRUE(file_util::Delete(test_dir_, true));
       ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc
index 02c2bb0..645cea8 100644
--- a/chrome/installer/util/delete_tree_work_item_unittest.cc
+++ b/chrome/installer/util/delete_tree_work_item_unittest.cc
@@ -35,7 +35,7 @@ namespace {
 
     virtual void TearDown() {
       // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, false));
+      ASSERT_TRUE(file_util::Delete(test_dir_, true));
       ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
diff --git a/chrome/installer/util/helper_unittest.cc b/chrome/installer/util/helper_unittest.cc
index 6ccbd29..05ca505 100644
--- a/chrome/installer/util/helper_unittest.cc
+++ b/chrome/installer/util/helper_unittest.cc
@@ -33,7 +33,7 @@ namespace {
     virtual void TearDown() {
       logging::CloseLogFile();
       // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, false));
+      ASSERT_TRUE(file_util::Delete(test_dir_, true));
       ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
diff --git a/chrome/installer/util/lzma_util_unittest.cc b/chrome/installer/util/lzma_util_unittest.cc
index c0a629a..b1c6363 100644
--- a/chrome/installer/util/lzma_util_unittest.cc
+++ b/chrome/installer/util/lzma_util_unittest.cc
@@ -31,7 +31,7 @@ class LzmaUtilTest : public testing::Test {
 
   virtual void TearDown() {
     // Clean up test directory
-    ASSERT_TRUE(file_util::Delete(test_dir_, false));
+    ASSERT_TRUE(file_util::Delete(test_dir_, true));
     ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
 
diff --git a/chrome/installer/util/move_tree_work_item_unittest.cc b/chrome/installer/util/move_tree_work_item_unittest.cc
index 9662b18..8daa601 100644
--- a/chrome/installer/util/move_tree_work_item_unittest.cc
+++ b/chrome/installer/util/move_tree_work_item_unittest.cc
@@ -39,7 +39,7 @@ namespace {
 
     virtual void TearDown() {
       // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, false));
+      ASSERT_TRUE(file_util::Delete(test_dir_, true));
       ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc
index 0deb339..143959a 100644
--- a/chrome/installer/util/shell_util_unittest.cc
+++ b/chrome/installer/util/shell_util_unittest.cc
@@ -98,7 +98,7 @@ class ShellUtilTest : public testing::Test {
 
   virtual void TearDown() {
     // Clean up test directory
-    ASSERT_TRUE(file_util::Delete(test_dir_, false));
+    ASSERT_TRUE(file_util::Delete(test_dir_, true));
     ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
 
-- 
cgit v1.1