| Index: chrome/installer/setup/install.cc
|
| diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
|
| index 43a8ed24c7cd20bb00b3cb62f5f652e166e2e66a..af9662322892c2eaff4361005cd3f522f3cc7383 100644
|
| --- a/chrome/installer/setup/install.cc
|
| +++ b/chrome/installer/setup/install.cc
|
| @@ -756,12 +756,9 @@
|
| bool force) {
|
| DCHECK(chrome.is_chrome());
|
|
|
| - std::unique_ptr<WorkItemList> cleanup_list(WorkItem::CreateWorkItemList());
|
| - cleanup_list->set_log_message("Cleanup deprecated per-user registrations");
|
| - cleanup_list->set_rollback_enabled(false);
|
| - cleanup_list->set_best_effort(true);
|
| - AddCleanupDeprecatedPerUserRegistrationsWorkItems(chrome, cleanup_list.get());
|
| - cleanup_list->Do();
|
| + NoRollbackWorkItemList cleanup_list;
|
| + AddCleanupDeprecatedPerUserRegistrationsWorkItems(chrome, &cleanup_list);
|
| + cleanup_list.Do();
|
|
|
| // Only create shortcuts on Active Setup if the first run sentinel is not
|
| // present for this user (as some shortcuts used to be installed on first
|
|
|