| Index: chrome/installer/setup/uninstall.cc
|
| diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
|
| index 5e1693ade46f61c7a4b220ce084a5094fc8c1872..cb5409b7b8835e82fdadb18109fa2fcb351acd8d 100644
|
| --- a/chrome/installer/setup/uninstall.cc
|
| +++ b/chrome/installer/setup/uninstall.cc
|
| @@ -160,22 +160,6 @@ void ProcessOnOsUpgradeWorkItems(
|
| LOG(ERROR) << "Failed to remove on-os-upgrade command.";
|
| }
|
|
|
| -// Adds or removes the quick-enable-cf command to the binaries' version key in
|
| -// the registry as needed.
|
| -void ProcessQuickEnableWorkItems(
|
| - const installer::InstallerState& installer_state,
|
| - const installer::InstallationState& machine_state) {
|
| - scoped_ptr<WorkItemList> work_item_list(
|
| - WorkItem::CreateNoRollbackWorkItemList());
|
| -
|
| - AddQuickEnableChromeFrameWorkItems(installer_state, machine_state,
|
| - base::FilePath(),
|
| - Version(), work_item_list.get());
|
| -
|
| - if (!work_item_list->Do())
|
| - LOG(ERROR) << "Failed to update quick-enable-cf command.";
|
| -}
|
| -
|
| void ProcessIELowRightsPolicyWorkItems(
|
| const installer::InstallerState& installer_state) {
|
| scoped_ptr<WorkItemList> work_items(WorkItem::CreateNoRollbackWorkItemList());
|
| @@ -1265,12 +1249,9 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
|
| }
|
| }
|
|
|
| - if (installer_state.is_multi_install()) {
|
| + if (installer_state.is_multi_install())
|
| ProcessGoogleUpdateItems(original_state, installer_state, product);
|
|
|
| - ProcessQuickEnableWorkItems(installer_state, original_state);
|
| - }
|
| -
|
| // Get the state of the installed product (if any)
|
| const ProductState* product_state =
|
| original_state.GetProductState(installer_state.system_install(),
|
|
|