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

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

Issue 19052005: Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/move_tree_work_item_unittest.cc
diff --git a/chrome/installer/util/move_tree_work_item_unittest.cc b/chrome/installer/util/move_tree_work_item_unittest.cc
index 34027879b09e5074bbabe42ef03633d53231f51c..c00a44d71dee8dc453aa0b2243ee7688a85dd325 100644
--- a/chrome/installer/util/move_tree_work_item_unittest.cc
+++ b/chrome/installer/util/move_tree_work_item_unittest.cc
@@ -308,7 +308,7 @@ TEST_F(MoveTreeWorkItemTest, MoveFileDestInUse) {
EXPECT_TRUE(base::PathExists(from_dir));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
EXPECT_TRUE(base::PathExists(to_dir));
- EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
+ EXPECT_TRUE(base::ContentsEqual(exe_full_path, to_file));
TerminateProcess(pi.hProcess, 0);
EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
@@ -363,7 +363,7 @@ TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
EXPECT_TRUE(base::PathExists(from_dir));
EXPECT_FALSE(base::PathExists(from_file));
EXPECT_TRUE(base::PathExists(to_dir));
- EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
+ EXPECT_TRUE(base::ContentsEqual(exe_full_path, to_file));
// Close the process and make sure all the conditions after Do() are
// still true.
@@ -375,13 +375,13 @@ TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
EXPECT_TRUE(base::PathExists(from_dir));
EXPECT_FALSE(base::PathExists(from_file));
EXPECT_TRUE(base::PathExists(to_dir));
- EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
+ EXPECT_TRUE(base::ContentsEqual(exe_full_path, to_file));
// test rollback()
work_item->Rollback();
EXPECT_TRUE(base::PathExists(from_dir));
- EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, from_file));
+ EXPECT_TRUE(base::ContentsEqual(exe_full_path, from_file));
EXPECT_TRUE(base::PathExists(to_dir));
EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent1));
}
« no previous file with comments | « chrome/installer/util/delete_after_reboot_helper.cc ('k') | chrome/installer/util/self_cleaning_temp_dir.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698