Index: chrome/installer/util/work_item_list_unittest.cc |
diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc |
index f6c2322d25af255f7ba9391d008968c576cb968d..0944b071096df1023299201e322c5a2035f818a5 100644 |
--- a/chrome/installer/util/work_item_list_unittest.cc |
+++ b/chrome/installer/util/work_item_list_unittest.cc |
@@ -59,7 +59,7 @@ TEST_F(WorkItemListTest, ExecutionSuccess) { |
top_dir_to_create = top_dir_to_create.AppendASCII("a"); |
base::FilePath dir_to_create(top_dir_to_create); |
dir_to_create = dir_to_create.AppendASCII("b"); |
- ASSERT_FALSE(file_util::PathExists(dir_to_create)); |
+ ASSERT_FALSE(base::PathExists(dir_to_create)); |
work_item.reset(reinterpret_cast<WorkItem*>( |
WorkItem::CreateCreateDirWorkItem(dir_to_create))); |
@@ -90,7 +90,7 @@ TEST_F(WorkItemListTest, ExecutionSuccess) { |
EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name.c_str(), &read_out)); |
EXPECT_EQ(0, read_out.compare(kDataStr)); |
key.Close(); |
- EXPECT_TRUE(file_util::PathExists(dir_to_create)); |
+ EXPECT_TRUE(base::PathExists(dir_to_create)); |
work_item_list->Rollback(); |
@@ -99,7 +99,7 @@ TEST_F(WorkItemListTest, ExecutionSuccess) { |
// can not be deleted. |
EXPECT_NE(ERROR_SUCCESS, |
key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ)); |
- EXPECT_FALSE(file_util::PathExists(top_dir_to_create)); |
+ EXPECT_FALSE(base::PathExists(top_dir_to_create)); |
} |
// Execute a WorkItem list. Fail in the middle. Rollback what has been done. |
@@ -111,7 +111,7 @@ TEST_F(WorkItemListTest, ExecutionFailAndRollback) { |
top_dir_to_create = top_dir_to_create.AppendASCII("a"); |
base::FilePath dir_to_create(top_dir_to_create); |
dir_to_create = dir_to_create.AppendASCII("b"); |
- ASSERT_FALSE(file_util::PathExists(dir_to_create)); |
+ ASSERT_FALSE(base::PathExists(dir_to_create)); |
work_item.reset(reinterpret_cast<WorkItem*>( |
WorkItem::CreateCreateDirWorkItem(dir_to_create))); |
@@ -148,7 +148,7 @@ TEST_F(WorkItemListTest, ExecutionFailAndRollback) { |
EXPECT_EQ(ERROR_SUCCESS, |
key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ)); |
key.Close(); |
- EXPECT_TRUE(file_util::PathExists(dir_to_create)); |
+ EXPECT_TRUE(base::PathExists(dir_to_create)); |
// The last one should not be there. |
EXPECT_NE(ERROR_SUCCESS, |
key.Open(HKEY_CURRENT_USER, not_created_key.c_str(), KEY_READ)); |
@@ -158,7 +158,7 @@ TEST_F(WorkItemListTest, ExecutionFailAndRollback) { |
// Verify everything is rolled back. |
EXPECT_NE(ERROR_SUCCESS, |
key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ)); |
- EXPECT_FALSE(file_util::PathExists(top_dir_to_create)); |
+ EXPECT_FALSE(base::PathExists(top_dir_to_create)); |
} |
TEST_F(WorkItemListTest, ConditionalExecutionSuccess) { |
@@ -169,7 +169,7 @@ TEST_F(WorkItemListTest, ConditionalExecutionSuccess) { |
top_dir_to_create = top_dir_to_create.AppendASCII("a"); |
base::FilePath dir_to_create(top_dir_to_create); |
dir_to_create = dir_to_create.AppendASCII("b"); |
- ASSERT_FALSE(file_util::PathExists(dir_to_create)); |
+ ASSERT_FALSE(base::PathExists(dir_to_create)); |
work_item.reset(reinterpret_cast<WorkItem*>( |
WorkItem::CreateCreateDirWorkItem(dir_to_create))); |
@@ -205,7 +205,7 @@ TEST_F(WorkItemListTest, ConditionalExecutionSuccess) { |
EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name.c_str(), &read_out)); |
EXPECT_EQ(0, read_out.compare(kDataStr)); |
key.Close(); |
- EXPECT_TRUE(file_util::PathExists(dir_to_create)); |
+ EXPECT_TRUE(base::PathExists(dir_to_create)); |
work_item_list->Rollback(); |
@@ -214,7 +214,7 @@ TEST_F(WorkItemListTest, ConditionalExecutionSuccess) { |
// can not be deleted. |
EXPECT_NE(ERROR_SUCCESS, |
key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ)); |
- EXPECT_FALSE(file_util::PathExists(top_dir_to_create)); |
+ EXPECT_FALSE(base::PathExists(top_dir_to_create)); |
} |
TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) { |
@@ -225,7 +225,7 @@ TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) { |
top_dir_to_create = top_dir_to_create.AppendASCII("a"); |
base::FilePath dir_to_create(top_dir_to_create); |
dir_to_create = dir_to_create.AppendASCII("b"); |
- ASSERT_FALSE(file_util::PathExists(dir_to_create)); |
+ ASSERT_FALSE(base::PathExists(dir_to_create)); |
work_item.reset(reinterpret_cast<WorkItem*>( |
WorkItem::CreateCreateDirWorkItem(dir_to_create))); |
@@ -263,7 +263,7 @@ TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) { |
key.Close(); |
// Verify that the other work item was executed. |
- EXPECT_TRUE(file_util::PathExists(dir_to_create)); |
+ EXPECT_TRUE(base::PathExists(dir_to_create)); |
work_item_list->Rollback(); |
@@ -272,5 +272,5 @@ TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) { |
// can not be deleted. |
EXPECT_NE(ERROR_SUCCESS, |
key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ)); |
- EXPECT_FALSE(file_util::PathExists(top_dir_to_create)); |
+ EXPECT_FALSE(base::PathExists(top_dir_to_create)); |
} |