summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 00:05:36 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 00:05:36 +0000
commit3a51cfdd1775075f13dab50f6d8a9cb04bd6beb9 (patch)
treed5357e00d02dc654a1f3b9593bbeaac900e0f30a /chrome/installer
parent7473b624aff7e1db5b22d7a856d1f21509fa04bc (diff)
downloadchromium_src-3a51cfdd1775075f13dab50f6d8a9cb04bd6beb9.zip
chromium_src-3a51cfdd1775075f13dab50f6d8a9cb04bd6beb9.tar.gz
chromium_src-3a51cfdd1775075f13dab50f6d8a9cb04bd6beb9.tar.bz2
Revert 46633 - 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 TBR=thestig@chromium.org Review URL: http://codereview.chromium.org/2038004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/util/copy_tree_work_item_unittest.cc2
-rw-r--r--chrome/installer/util/create_dir_work_item_unittest.cc2
-rw-r--r--chrome/installer/util/delete_tree_work_item_unittest.cc2
-rw-r--r--chrome/installer/util/helper_unittest.cc2
-rw-r--r--chrome/installer/util/lzma_util_unittest.cc2
-rw-r--r--chrome/installer/util/move_tree_work_item_unittest.cc2
-rw-r--r--chrome/installer/util/shell_util_unittest.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/chrome/installer/util/copy_tree_work_item_unittest.cc b/chrome/installer/util/copy_tree_work_item_unittest.cc
index d24d4ae..bc187e61 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
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 4c8df50..49f9460 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
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 645cea8..02c2bb0 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
ASSERT_FALSE(file_util::PathExists(test_dir_));
}
diff --git a/chrome/installer/util/helper_unittest.cc b/chrome/installer/util/helper_unittest.cc
index 05ca505..6ccbd29 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
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 b1c6363..c0a629a 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
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 8daa601..9662b18 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
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 143959a..0deb339 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_, true));
+ ASSERT_TRUE(file_util::Delete(test_dir_, false));
ASSERT_FALSE(file_util::PathExists(test_dir_));
}