| 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 873678ec662e51f7ecf3884ffe5b4631e2889cfe..2c4bb006fc7d11b3de4b47e52e9ade5a09e7144c 100644
|
| --- a/chrome/installer/util/work_item_list_unittest.cc
|
| +++ b/chrome/installer/util/work_item_list_unittest.cc
|
| @@ -17,8 +17,8 @@ class MockWorkItem : public WorkItem {
|
| public:
|
| MockWorkItem() = default;
|
|
|
| - MOCK_METHOD0(Do, bool());
|
| - MOCK_METHOD0(Rollback, void());
|
| + MOCK_METHOD0(DoImpl, bool());
|
| + MOCK_METHOD0(RollbackImpl, void());
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(MockWorkItem);
|
| @@ -43,12 +43,12 @@ TEST(WorkItemListTest, ExecutionSuccess) {
|
| // Expect all three items to be done in order then undone.
|
| InSequence s;
|
|
|
| - EXPECT_CALL(*item1, Do()).WillOnce(Return(true));
|
| - EXPECT_CALL(*item2, Do()).WillOnce(Return(true));
|
| - EXPECT_CALL(*item3, Do()).WillOnce(Return(true));
|
| - EXPECT_CALL(*item3, Rollback());
|
| - EXPECT_CALL(*item2, Rollback());
|
| - EXPECT_CALL(*item1, Rollback());
|
| + EXPECT_CALL(*item1, DoImpl()).WillOnce(Return(true));
|
| + EXPECT_CALL(*item2, DoImpl()).WillOnce(Return(true));
|
| + EXPECT_CALL(*item3, DoImpl()).WillOnce(Return(true));
|
| + EXPECT_CALL(*item3, RollbackImpl());
|
| + EXPECT_CALL(*item2, RollbackImpl());
|
| + EXPECT_CALL(*item1, RollbackImpl());
|
| }
|
|
|
| // Add the items to the list.
|
| @@ -74,10 +74,10 @@ TEST(WorkItemListTest, ExecutionFailAndRollback) {
|
| // Expect the two first work items to be done in order then undone.
|
| InSequence s;
|
|
|
| - EXPECT_CALL(*item1, Do()).WillOnce(Return(true));
|
| - EXPECT_CALL(*item2, Do()).WillOnce(Return(false));
|
| - EXPECT_CALL(*item2, Rollback());
|
| - EXPECT_CALL(*item1, Rollback());
|
| + EXPECT_CALL(*item1, DoImpl()).WillOnce(Return(true));
|
| + EXPECT_CALL(*item2, DoImpl()).WillOnce(Return(false));
|
| + EXPECT_CALL(*item2, RollbackImpl());
|
| + EXPECT_CALL(*item1, RollbackImpl());
|
| }
|
|
|
| // Add the items to the list.
|
|
|