Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2108)

Unified Diff: chrome/installer/util/delete_tree_work_item_unittest.cc

Issue 6538025: Temp dir cleanup:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/delete_tree_work_item_unittest.cc
===================================================================
--- chrome/installer/util/delete_tree_work_item_unittest.cc (revision 75264)
+++ chrome/installer/util/delete_tree_work_item_unittest.cc (working copy)
@@ -12,6 +12,7 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/scoped_ptr.h"
+#include "base/scoped_temp_dir.h"
#include "base/string_util.h"
#include "chrome/installer/util/delete_tree_work_item.h"
#include "chrome/installer/util/work_item.h"
@@ -85,9 +86,13 @@
ASSERT_TRUE(file_util::PathExists(file_name_delete_2));
// test Do()
+ ScopedTempDir temp_dir;
+ ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
std::vector<FilePath> key_files;
scoped_ptr<DeleteTreeWorkItem> work_item(
- WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, key_files));
+ WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, temp_dir.path(),
+ key_files));
EXPECT_TRUE(work_item->Do());
// everything should be gone
@@ -133,9 +138,13 @@
ASSERT_TRUE(file_util::PathExists(file_name_delete_2));
// test Do()
+ ScopedTempDir temp_dir;
+ ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
std::vector<FilePath> key_files(1, file_name_delete_1);
scoped_ptr<DeleteTreeWorkItem> work_item(
- WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, key_files));
+ WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, temp_dir.path(),
+ key_files));
EXPECT_TRUE(work_item->Do());
// everything should be gone
@@ -202,9 +211,13 @@
// test Do().
{
+ ScopedTempDir temp_dir;
+ ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
std::vector<FilePath> key_paths(1, key_path);
scoped_ptr<DeleteTreeWorkItem> work_item(
- WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, key_paths));
+ WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, temp_dir.path(),
+ key_paths));
// delete should fail as file in use.
EXPECT_FALSE(work_item->Do());

Powered by Google App Engine
This is Rietveld 408576698