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

chrome/installer/setup/install_worker_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/version.h"
@@ skipping 48 matching lines @@
                          CopyOverWriteOption,
                          const std::wstring&));
   MOCK_METHOD1(AddCreateDirWorkItem, WorkItem* (const base::FilePath&));
   MOCK_METHOD3(AddCreateRegKeyWorkItem,
                WorkItem*(HKEY, const std::wstring&, REGSAM));
   MOCK_METHOD3(AddDeleteRegKeyWorkItem,
                WorkItem*(HKEY, const std::wstring&, REGSAM));
   MOCK_METHOD4(
       AddDeleteRegValueWorkItem,
       WorkItem*(HKEY, const std::wstring&, REGSAM, const std::wstring&));
+  MOCK_METHOD3(AddDeleteTreeWorkItem,
+               WorkItem*(const base::FilePath&,
+                         const base::FilePath&,
+                         const std::vector<base::FilePath>&));
   MOCK_METHOD2(AddDeleteTreeWorkItem,
                WorkItem*(const base::FilePath&, const base::FilePath&));
   MOCK_METHOD4(AddMoveTreeWorkItem,
                WorkItem*(const std::wstring&,
                          const std::wstring&,
                          const std::wstring&,
                          MoveTreeOption));
   // Workaround for gmock problems with disambiguating between string pointers
   // and DWORD.
   virtual WorkItem* AddSetRegValueWorkItem(HKEY a1,
@@ skipping 373 matching lines @@
 
   const HKEY kRegRoot = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   static const wchar_t kRegKeyPath[] = L"Software\\Chromium\\test";
   std::unique_ptr<CreateRegKeyWorkItem> create_reg_key_work_item(
       WorkItem::CreateCreateRegKeyWorkItem(kRegRoot, kRegKeyPath,
                                            WorkItem::kWow64Default));
   std::unique_ptr<SetRegValueWorkItem> set_reg_value_work_item(
       WorkItem::CreateSetRegValueWorkItem(
           kRegRoot, kRegKeyPath, WorkItem::kWow64Default, L"", L"", false));
   std::unique_ptr<DeleteTreeWorkItem> delete_tree_work_item(
-      WorkItem::CreateDeleteTreeWorkItem(base::FilePath(), base::FilePath()));
+      WorkItem::CreateDeleteTreeWorkItem(base::FilePath(), base::FilePath(),
+                                         std::vector<base::FilePath>()));
   std::unique_ptr<DeleteRegKeyWorkItem> delete_reg_key_work_item(
       WorkItem::CreateDeleteRegKeyWorkItem(kRegRoot, kRegKeyPath,
                                            WorkItem::kWow64Default));
 
   std::unique_ptr<InstallationState> installation_state(
       BuildChromeInstallationState(system_level, multi_install));
 
   std::unique_ptr<InstallerState> installer_state(BuildChromeInstallerState(
       system_level, multi_install, *installation_state,
       InstallerState::SINGLE_INSTALL_OR_UPDATE));
@@ skipping 348 matching lines @@
               prod_type_list[i_type_check]);
           bool prod_expect = (mach_after & (1 << i_type_check)) != 0;
           EXPECT_EQ(prod_expect, prod_res);
         }
       }
     }
   }
 }
 
 #endif  // defined(GOOGLE_CHROME_BUILD)