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

chrome/installer/setup/uninstall.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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <windows.h>
 #include <stddef.h>
@@ skipping 120 matching lines @@
       original_state.GetProductState(system_level, distribution->GetType());
   DCHECK(product_state != NULL);
   ChannelInfo channel_info;
 
   // Remove product's flags from the channel value.
   channel_info.set_value(product_state->channel().value());
   const bool modified = product.SetChannelFlags(false, &channel_info);
 
   // Apply the new channel value to all other products and to the multi package.
   if (modified) {
-    std::unique_ptr<WorkItemList> update_list(WorkItem::CreateWorkItemList());
-    update_list->set_log_message("Channel Value Update");
-    update_list->set_best_effort(true);
-    update_list->set_rollback_enabled(false);
+    std::unique_ptr<WorkItemList> update_list(
+        WorkItem::CreateNoRollbackWorkItemList());
     std::vector<BrowserDistribution::Type> dist_types;
     for (size_t i = 0; i < BrowserDistribution::NUM_TYPES; ++i) {
       BrowserDistribution::Type other_dist_type =
           static_cast<BrowserDistribution::Type>(i);
       if (distribution->GetType() != other_dist_type)
         dist_types.push_back(other_dist_type);
     }
     AddChannelValueUpdateWorkItems(original_state, installer_state,
                                    channel_info, dist_types,
                                    update_list.get());
-    update_list->Do();
+    bool success = update_list->Do();
+    LOG_IF(ERROR, !success) << "Failed updating channel values.";
   }
 }
 
 // Processes uninstall WorkItems from install_worker in no-rollback-list.
 void ProcessChromeWorkItems(const InstallerState& installer_state,
                             const Product& product) {
-  std::unique_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
-  work_item_list->set_log_message(
-      "Cleanup OS upgrade command and deprecated per-user registrations");
-  work_item_list->set_best_effort(true);
-  work_item_list->set_rollback_enabled(false);
+  std::unique_ptr<WorkItemList> work_item_list(
+      WorkItem::CreateNoRollbackWorkItemList());
   AddOsUpgradeWorkItems(installer_state, base::FilePath(), Version(), product,
                         work_item_list.get());
   // Perform a best-effort cleanup of per-user keys. On system-level installs
   // this will only cleanup keys for the user running the uninstall but it was
   // considered that this was good enough (better than triggering Active Setup
   // for all users solely for this cleanup).
   AddCleanupDeprecatedPerUserRegistrationsWorkItems(product,
                                                     work_item_list.get());
-  work_item_list->Do();
+  if (!work_item_list->Do())
+    LOG(ERROR) << "Failed to process Chrome WorkItems.";
 }
 
 void ProcessIELowRightsPolicyWorkItems(const InstallerState& installer_state) {
-  std::unique_ptr<WorkItemList> work_items(WorkItem::CreateWorkItemList());
-  work_items->set_log_message("Delete old IE low rights policy");
-  work_items->set_best_effort(true);
-  work_items->set_rollback_enabled(false);
+  std::unique_ptr<WorkItemList> work_items(
+      WorkItem::CreateNoRollbackWorkItemList());
   AddDeleteOldIELowRightsPolicyWorkItems(installer_state, work_items.get());
   work_items->Do();
   RefreshElevationPolicy();
 }
 
 void ClearRlzProductState() {
   const rlz_lib::AccessPoint points[] = {rlz_lib::CHROME_OMNIBOX,
                                          rlz_lib::CHROME_HOME_PAGE,
                                          rlz_lib::CHROME_APP_LIST,
                                          rlz_lib::NO_ACCESS_POINT};
@@ skipping 1243 matching lines @@
     // If we need a reboot to continue, schedule the parent directories for
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
     *uninstall_status = UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer