Revert of Add best-effort/allow rollback flags on WorkItem.

chrome/installer/util/conditional_work_item_list_unittest.cc

Index: chrome/installer/util/conditional_work_item_list_unittest.cc
diff --git a/chrome/installer/util/conditional_work_item_list_unittest.cc b/chrome/installer/util/conditional_work_item_list_unittest.cc
index cf38d3434ed81609b4044c0b501c984b59ac3bea..1268f5dfbea1e54b5b2eb8eb46281d1a3d23aed5 100644
--- a/chrome/installer/util/conditional_work_item_list_unittest.cc
+++ b/chrome/installer/util/conditional_work_item_list_unittest.cc
@@ -33,12 +33,12 @@
     // Expect all three items to be done in order then undone.
     InSequence s;
 
-    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());
+    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());
   }
 
   // Add the items to the list.
@@ -68,10 +68,10 @@
     // Expect the two first work items to be done in order then undone.
     InSequence s;
 
-    EXPECT_CALL(*item1, DoImpl()).WillOnce(Return(true));
-    EXPECT_CALL(*item2, DoImpl()).WillOnce(Return(false));
-    EXPECT_CALL(*item2, RollbackImpl());
-    EXPECT_CALL(*item1, RollbackImpl());
+    EXPECT_CALL(*item1, Do()).WillOnce(Return(true));
+    EXPECT_CALL(*item2, Do()).WillOnce(Return(false));
+    EXPECT_CALL(*item2, Rollback());
+    EXPECT_CALL(*item1, Rollback());
   }
 
   // Add the items to the list.