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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 18286004: Move PathExists to 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
« no previous file with comments | « chrome/installer/util/move_tree_work_item.cc ('k') | chrome/installer/util/self_cleaning_temp_dir.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 011f9caa650d049172701f3f1d0e3f29771b494e..34027879b09e5074bbabe42ef03633d53231f51c 100644
--- a/chrome/installer/util/move_tree_work_item_unittest.cc
+++ b/chrome/installer/util/move_tree_work_item_unittest.cc
@@ -62,27 +62,27 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectory) {
base::FilePath from_dir1(temp_from_dir_.path());
from_dir1 = from_dir1.AppendASCII("From_Dir1");
file_util::CreateDirectory(from_dir1);
- ASSERT_TRUE(file_util::PathExists(from_dir1));
+ ASSERT_TRUE(base::PathExists(from_dir1));
base::FilePath from_dir2(from_dir1);
from_dir2 = from_dir2.AppendASCII("From_Dir2");
file_util::CreateDirectory(from_dir2);
- ASSERT_TRUE(file_util::PathExists(from_dir2));
+ ASSERT_TRUE(base::PathExists(from_dir2));
base::FilePath from_file(from_dir2);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// Generate destination path
base::FilePath to_dir(temp_from_dir_.path());
to_dir = to_dir.AppendASCII("To_Dir");
- ASSERT_FALSE(file_util::PathExists(to_dir));
+ ASSERT_FALSE(base::PathExists(to_dir));
base::FilePath to_file(to_dir);
to_file = to_file.AppendASCII("From_Dir2");
to_file = to_file.AppendASCII("From_File");
- ASSERT_FALSE(file_util::PathExists(to_file));
+ ASSERT_FALSE(base::PathExists(to_file));
// test Do()
scoped_ptr<MoveTreeWorkItem> work_item(
@@ -92,16 +92,16 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectory) {
WorkItem::ALWAYS_MOVE));
EXPECT_TRUE(work_item->Do());
- EXPECT_FALSE(file_util::PathExists(from_dir1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_TRUE(file_util::PathExists(to_file));
+ EXPECT_FALSE(base::PathExists(from_dir1));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(to_file));
// test rollback()
work_item->Rollback();
- EXPECT_TRUE(file_util::PathExists(from_dir1));
- EXPECT_TRUE(file_util::PathExists(from_file));
- EXPECT_FALSE(file_util::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(from_dir1));
+ EXPECT_TRUE(base::PathExists(from_file));
+ EXPECT_FALSE(base::PathExists(to_dir));
}
// Move one directory from source to destination when destination already
@@ -111,33 +111,33 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExists) {
base::FilePath from_dir1(temp_from_dir_.path());
from_dir1 = from_dir1.AppendASCII("From_Dir1");
file_util::CreateDirectory(from_dir1);
- ASSERT_TRUE(file_util::PathExists(from_dir1));
+ ASSERT_TRUE(base::PathExists(from_dir1));
base::FilePath from_dir2(from_dir1);
from_dir2 = from_dir2.AppendASCII("From_Dir2");
file_util::CreateDirectory(from_dir2);
- ASSERT_TRUE(file_util::PathExists(from_dir2));
+ ASSERT_TRUE(base::PathExists(from_dir2));
base::FilePath from_file(from_dir2);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// Create destination path
base::FilePath to_dir(temp_from_dir_.path());
to_dir = to_dir.AppendASCII("To_Dir");
file_util::CreateDirectory(to_dir);
- ASSERT_TRUE(file_util::PathExists(to_dir));
+ ASSERT_TRUE(base::PathExists(to_dir));
base::FilePath orig_to_file(to_dir);
orig_to_file = orig_to_file.AppendASCII("To_File");
CreateTextFile(orig_to_file.value(), kTextContent2);
- ASSERT_TRUE(file_util::PathExists(orig_to_file));
+ ASSERT_TRUE(base::PathExists(orig_to_file));
base::FilePath new_to_file(to_dir);
new_to_file = new_to_file.AppendASCII("From_Dir2");
new_to_file = new_to_file.AppendASCII("From_File");
- ASSERT_FALSE(file_util::PathExists(new_to_file));
+ ASSERT_FALSE(base::PathExists(new_to_file));
// test Do(), don't check for duplicates.
scoped_ptr<MoveTreeWorkItem> work_item(
@@ -147,18 +147,18 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExists) {
WorkItem::ALWAYS_MOVE));
EXPECT_TRUE(work_item->Do());
- EXPECT_FALSE(file_util::PathExists(from_dir1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_TRUE(file_util::PathExists(new_to_file));
- EXPECT_FALSE(file_util::PathExists(orig_to_file));
+ EXPECT_FALSE(base::PathExists(from_dir1));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(new_to_file));
+ EXPECT_FALSE(base::PathExists(orig_to_file));
// test rollback()
work_item->Rollback();
- EXPECT_TRUE(file_util::PathExists(from_dir1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_FALSE(file_util::PathExists(new_to_file));
- EXPECT_TRUE(file_util::PathExists(orig_to_file));
+ EXPECT_TRUE(base::PathExists(from_dir1));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_FALSE(base::PathExists(new_to_file));
+ EXPECT_TRUE(base::PathExists(orig_to_file));
EXPECT_EQ(0, ReadTextFile(orig_to_file).compare(kTextContent2));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
}
@@ -170,17 +170,17 @@ TEST_F(MoveTreeWorkItemTest, MoveAFile) {
base::FilePath from_dir(temp_from_dir_.path());
from_dir = from_dir.AppendASCII("From_Dir");
file_util::CreateDirectory(from_dir);
- ASSERT_TRUE(file_util::PathExists(from_dir));
+ ASSERT_TRUE(base::PathExists(from_dir));
base::FilePath from_file(from_dir);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// Generate destination file name
base::FilePath to_file(temp_from_dir_.path());
to_file = to_file.AppendASCII("To_File");
- ASSERT_FALSE(file_util::PathExists(to_file));
+ ASSERT_FALSE(base::PathExists(to_file));
// test Do()
scoped_ptr<MoveTreeWorkItem> work_item(
@@ -190,17 +190,17 @@ TEST_F(MoveTreeWorkItemTest, MoveAFile) {
WorkItem::ALWAYS_MOVE));
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(file_util::PathExists(from_dir));
- EXPECT_FALSE(file_util::PathExists(from_file));
- EXPECT_TRUE(file_util::PathExists(to_file));
+ EXPECT_TRUE(base::PathExists(from_dir));
+ EXPECT_FALSE(base::PathExists(from_file));
+ EXPECT_TRUE(base::PathExists(to_file));
EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent1));
// test rollback()
work_item->Rollback();
- EXPECT_TRUE(file_util::PathExists(from_dir));
- EXPECT_TRUE(file_util::PathExists(from_file));
- EXPECT_FALSE(file_util::PathExists(to_file));
+ EXPECT_TRUE(base::PathExists(from_dir));
+ EXPECT_TRUE(base::PathExists(from_file));
+ EXPECT_FALSE(base::PathExists(to_file));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
}
@@ -211,23 +211,23 @@ TEST_F(MoveTreeWorkItemTest, MoveFileDestExists) {
base::FilePath from_dir(temp_from_dir_.path());
from_dir = from_dir.AppendASCII("From_Dir");
file_util::CreateDirectory(from_dir);
- ASSERT_TRUE(file_util::PathExists(from_dir));
+ ASSERT_TRUE(base::PathExists(from_dir));
base::FilePath from_file(from_dir);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// Create destination path
base::FilePath to_dir(temp_from_dir_.path());
to_dir = to_dir.AppendASCII("To_Dir");
file_util::CreateDirectory(to_dir);
- ASSERT_TRUE(file_util::PathExists(to_dir));
+ ASSERT_TRUE(base::PathExists(to_dir));
base::FilePath to_file(to_dir);
to_file = to_file.AppendASCII("To_File");
CreateTextFile(to_file.value(), kTextContent2);
- ASSERT_TRUE(file_util::PathExists(to_file));
+ ASSERT_TRUE(base::PathExists(to_file));
// test Do()
scoped_ptr<MoveTreeWorkItem> work_item(
@@ -237,18 +237,18 @@ TEST_F(MoveTreeWorkItemTest, MoveFileDestExists) {
WorkItem::ALWAYS_MOVE));
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(file_util::PathExists(from_dir));
- EXPECT_FALSE(file_util::PathExists(from_file));
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_FALSE(file_util::PathExists(to_file));
+ EXPECT_TRUE(base::PathExists(from_dir));
+ EXPECT_FALSE(base::PathExists(from_file));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_FALSE(base::PathExists(to_file));
EXPECT_EQ(0, ReadTextFile(to_dir).compare(kTextContent1));
// test rollback()
work_item->Rollback();
- EXPECT_TRUE(file_util::PathExists(from_dir));
+ EXPECT_TRUE(base::PathExists(from_dir));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(to_dir));
EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent2));
}
@@ -259,18 +259,18 @@ TEST_F(MoveTreeWorkItemTest, MoveFileDestInUse) {
base::FilePath from_dir(temp_from_dir_.path());
from_dir = from_dir.AppendASCII("From_Dir");
file_util::CreateDirectory(from_dir);
- ASSERT_TRUE(file_util::PathExists(from_dir));
+ ASSERT_TRUE(base::PathExists(from_dir));
base::FilePath from_file(from_dir);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// Create an executable in destination path by copying ourself to it.
base::FilePath to_dir(temp_from_dir_.path());
to_dir = to_dir.AppendASCII("To_Dir");
file_util::CreateDirectory(to_dir);
- ASSERT_TRUE(file_util::PathExists(to_dir));
+ ASSERT_TRUE(base::PathExists(to_dir));
wchar_t exe_full_path_str[MAX_PATH];
::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH);
@@ -278,7 +278,7 @@ TEST_F(MoveTreeWorkItemTest, MoveFileDestInUse) {
base::FilePath to_file(to_dir);
to_file = to_file.AppendASCII("To_File");
base::CopyFile(exe_full_path, to_file);
- ASSERT_TRUE(file_util::PathExists(to_file));
+ ASSERT_TRUE(base::PathExists(to_file));
// Run the executable in destination path
STARTUPINFOW si = {sizeof(si)};
@@ -297,17 +297,17 @@ TEST_F(MoveTreeWorkItemTest, MoveFileDestInUse) {
WorkItem::ALWAYS_MOVE));
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(file_util::PathExists(from_dir));
- EXPECT_FALSE(file_util::PathExists(from_file));
- EXPECT_TRUE(file_util::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(from_dir));
+ EXPECT_FALSE(base::PathExists(from_file));
+ EXPECT_TRUE(base::PathExists(to_dir));
EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent1));
// test rollback()
work_item->Rollback();
- EXPECT_TRUE(file_util::PathExists(from_dir));
+ EXPECT_TRUE(base::PathExists(from_dir));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(to_dir));
EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
TerminateProcess(pi.hProcess, 0);
@@ -322,7 +322,7 @@ TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
base::FilePath from_dir(temp_from_dir_.path());
from_dir = from_dir.AppendASCII("From_Dir");
file_util::CreateDirectory(from_dir);
- ASSERT_TRUE(file_util::PathExists(from_dir));
+ ASSERT_TRUE(base::PathExists(from_dir));
wchar_t exe_full_path_str[MAX_PATH];
::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH);
@@ -330,18 +330,18 @@ TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
base::FilePath from_file(from_dir);
from_file = from_file.AppendASCII("From_File");
base::CopyFile(exe_full_path, from_file);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// Create a destination source dir and generate destination file name.
base::FilePath to_dir(temp_from_dir_.path());
to_dir = to_dir.AppendASCII("To_Dir");
file_util::CreateDirectory(to_dir);
- ASSERT_TRUE(file_util::PathExists(to_dir));
+ ASSERT_TRUE(base::PathExists(to_dir));
base::FilePath to_file(to_dir);
to_file = to_file.AppendASCII("To_File");
CreateTextFile(to_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(to_file));
+ ASSERT_TRUE(base::PathExists(to_file));
// Run the executable in source path
STARTUPINFOW si = {sizeof(si)};
@@ -360,9 +360,9 @@ TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
WorkItem::ALWAYS_MOVE));
EXPECT_TRUE(work_item->Do());
- EXPECT_TRUE(file_util::PathExists(from_dir));
- EXPECT_FALSE(file_util::PathExists(from_file));
- EXPECT_TRUE(file_util::PathExists(to_dir));
+ 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));
// Close the process and make sure all the conditions after Do() are
@@ -372,17 +372,17 @@ TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
- EXPECT_TRUE(file_util::PathExists(from_dir));
- EXPECT_FALSE(file_util::PathExists(from_file));
- EXPECT_TRUE(file_util::PathExists(to_dir));
+ 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));
// test rollback()
work_item->Rollback();
- EXPECT_TRUE(file_util::PathExists(from_dir));
+ EXPECT_TRUE(base::PathExists(from_dir));
EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, from_file));
- EXPECT_TRUE(file_util::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(to_dir));
EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent1));
}
@@ -393,17 +393,17 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesFull) {
base::FilePath from_dir1(temp_from_dir_.path());
from_dir1 = from_dir1.AppendASCII("From_Dir1");
file_util::CreateDirectory(from_dir1);
- ASSERT_TRUE(file_util::PathExists(from_dir1));
+ ASSERT_TRUE(base::PathExists(from_dir1));
base::FilePath from_dir2(from_dir1);
from_dir2 = from_dir2.AppendASCII("From_Dir2");
file_util::CreateDirectory(from_dir2);
- ASSERT_TRUE(file_util::PathExists(from_dir2));
+ ASSERT_TRUE(base::PathExists(from_dir2));
base::FilePath from_file(from_dir2);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
// // Create a file hierarchy identical to the one in the source directory.
base::FilePath to_dir(temp_from_dir_.path());
@@ -435,10 +435,10 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesFull) {
// Make sure that we "moved" the files, i.e. that the source directory isn't
// there anymore,
- EXPECT_FALSE(file_util::PathExists(from_dir1));
+ EXPECT_FALSE(base::PathExists(from_dir1));
// Make sure that the original directory structure and file are still present.
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_TRUE(file_util::PathExists(orig_to_file));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(orig_to_file));
// Make sure that the backup path is not empty.
EXPECT_FALSE(file_util::IsDirectoryEmpty(temp_to_dir_.path()));
@@ -452,9 +452,9 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesFull) {
// Once we rollback all the original files should still be there, as should
// the source files.
- EXPECT_TRUE(file_util::PathExists(from_dir1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_TRUE(file_util::PathExists(orig_to_file));
+ EXPECT_TRUE(base::PathExists(from_dir1));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(orig_to_file));
EXPECT_EQ(0, ReadTextFile(orig_to_file).compare(kTextContent1));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
}
@@ -466,40 +466,40 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesPartial) {
base::FilePath from_dir1(temp_from_dir_.path());
from_dir1 = from_dir1.AppendASCII("From_Dir1");
file_util::CreateDirectory(from_dir1);
- ASSERT_TRUE(file_util::PathExists(from_dir1));
+ ASSERT_TRUE(base::PathExists(from_dir1));
base::FilePath from_dir2(from_dir1);
from_dir2 = from_dir2.AppendASCII("From_Dir2");
file_util::CreateDirectory(from_dir2);
- ASSERT_TRUE(file_util::PathExists(from_dir2));
+ ASSERT_TRUE(base::PathExists(from_dir2));
base::FilePath from_file(from_dir2);
from_file = from_file.AppendASCII("From_File");
CreateTextFile(from_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(from_file));
+ ASSERT_TRUE(base::PathExists(from_file));
base::FilePath from_file2(from_dir2);
from_file2 = from_file2.AppendASCII("From_File2");
CreateTextFile(from_file2.value(), kTextContent2);
- ASSERT_TRUE(file_util::PathExists(from_file2));
+ ASSERT_TRUE(base::PathExists(from_file2));
// Create destination path
base::FilePath to_dir(temp_from_dir_.path());
to_dir = to_dir.AppendASCII("To_Dir");
file_util::CreateDirectory(to_dir);
- ASSERT_TRUE(file_util::PathExists(to_dir));
+ ASSERT_TRUE(base::PathExists(to_dir));
// Create a sub-directory of the same name as in the source directory.
base::FilePath to_dir2(to_dir);
to_dir2 = to_dir2.AppendASCII("From_Dir2");
file_util::CreateDirectory(to_dir2);
- ASSERT_TRUE(file_util::PathExists(to_dir2));
+ ASSERT_TRUE(base::PathExists(to_dir2));
// Create one of the files in the to sub-directory, but not the other.
base::FilePath orig_to_file(to_dir2);
orig_to_file = orig_to_file.AppendASCII("From_File");
CreateTextFile(orig_to_file.value(), kTextContent1);
- ASSERT_TRUE(file_util::PathExists(orig_to_file));
+ ASSERT_TRUE(base::PathExists(orig_to_file));
// test Do(), check for duplicates.
scoped_ptr<MoveTreeWorkItem> work_item(
@@ -511,16 +511,16 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesPartial) {
// Make sure that we "moved" the files, i.e. that the source directory isn't
// there anymore,
- EXPECT_FALSE(file_util::PathExists(from_dir1));
+ EXPECT_FALSE(base::PathExists(from_dir1));
// Make sure that the original directory structure and file are still present.
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_TRUE(file_util::PathExists(orig_to_file));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(orig_to_file));
// Make sure that the backup path is not empty.
EXPECT_FALSE(file_util::IsDirectoryEmpty(temp_to_dir_.path()));
// Make sure that the "new" file is also present.
base::FilePath new_to_file2(to_dir2);
new_to_file2 = new_to_file2.AppendASCII("From_File2");
- EXPECT_TRUE(file_util::PathExists(new_to_file2));
+ EXPECT_TRUE(base::PathExists(new_to_file2));
// Check that the work item believes that this was a regular move.
EXPECT_FALSE(work_item->source_moved_to_backup_);
@@ -532,12 +532,12 @@ TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesPartial) {
// Once we rollback all the original files should still be there, as should
// the source files.
- EXPECT_TRUE(file_util::PathExists(from_dir1));
- EXPECT_TRUE(file_util::PathExists(to_dir));
- EXPECT_TRUE(file_util::PathExists(orig_to_file));
+ EXPECT_TRUE(base::PathExists(from_dir1));
+ EXPECT_TRUE(base::PathExists(to_dir));
+ EXPECT_TRUE(base::PathExists(orig_to_file));
EXPECT_EQ(0, ReadTextFile(orig_to_file).compare(kTextContent1));
EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
// Also, after rollback the new "to" file should be gone.
- EXPECT_FALSE(file_util::PathExists(new_to_file2));
+ EXPECT_FALSE(base::PathExists(new_to_file2));
}
« no previous file with comments | « chrome/installer/util/move_tree_work_item.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