Index: chrome/installer/util/work_item_list_unittest.cc |
=================================================================== |
--- chrome/installer/util/work_item_list_unittest.cc (revision 24065) |
+++ chrome/installer/util/work_item_list_unittest.cc (working copy) |
@@ -55,14 +55,14 @@ |
scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList()); |
scoped_ptr<WorkItem> work_item; |
- std::wstring top_dir_to_create(test_dir_.ToWStringHack()); |
- file_util::AppendToPath(&top_dir_to_create, L"a"); |
- std::wstring dir_to_create(top_dir_to_create); |
- file_util::AppendToPath(&dir_to_create, L"b"); |
+ FilePath top_dir_to_create(test_dir_); |
+ top_dir_to_create = top_dir_to_create.AppendASCII("a"); |
+ FilePath dir_to_create(top_dir_to_create); |
+ dir_to_create = dir_to_create.AppendASCII("b"); |
ASSERT_FALSE(file_util::PathExists(dir_to_create)); |
work_item.reset(reinterpret_cast<WorkItem*>( |
- WorkItem::CreateCreateDirWorkItem(dir_to_create))); |
+ WorkItem::CreateCreateDirWorkItem(dir_to_create.ToWStringHack()))); |
EXPECT_TRUE(work_item_list->AddWorkItem(work_item.release())); |
std::wstring key_to_create(test_root); |
@@ -104,14 +104,14 @@ |
scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList()); |
scoped_ptr<WorkItem> work_item; |
- std::wstring top_dir_to_create(test_dir_.ToWStringHack()); |
- file_util::AppendToPath(&top_dir_to_create, L"a"); |
- std::wstring dir_to_create(top_dir_to_create); |
- file_util::AppendToPath(&dir_to_create, L"b"); |
+ FilePath top_dir_to_create(test_dir_); |
+ top_dir_to_create = top_dir_to_create.AppendASCII("a"); |
+ FilePath dir_to_create(top_dir_to_create); |
+ dir_to_create = dir_to_create.AppendASCII("b"); |
ASSERT_FALSE(file_util::PathExists(dir_to_create)); |
work_item.reset(reinterpret_cast<WorkItem*>( |
- WorkItem::CreateCreateDirWorkItem(dir_to_create))); |
+ WorkItem::CreateCreateDirWorkItem(dir_to_create.ToWStringHack()))); |
EXPECT_TRUE(work_item_list->AddWorkItem(work_item.release())); |
std::wstring key_to_create(test_root); |