Revert 148046 - Revert 147650 - Implement installation of the Chrome App Host.

chrome/installer/setup/chrome_frame_quick_enable.cc

Index: chrome/installer/setup/chrome_frame_quick_enable.cc
===================================================================
--- chrome/installer/setup/chrome_frame_quick_enable.cc	(revision 148103)
+++ chrome/installer/setup/chrome_frame_quick_enable.cc	(working copy)
@@ -100,8 +100,6 @@
 
       FilePath setup_path(chrome_state->GetSetupPath());
       const Version& new_version = chrome_state->version();
-      FilePath new_chrome_exe(
-          installer_state->target_path().Append(installer::kChromeNewExe));
 
       // This creates the uninstallation entry for GCF.
       AddUninstallShortcutWorkItems(*installer_state, setup_path, new_version,
@@ -114,7 +112,7 @@
                               new_version, *cf, item_list.get());
 
       const Version* opv = chrome_state->old_version();
-      AppendPostInstallTasks(*installer_state, setup_path, new_chrome_exe, opv,
+      AppendPostInstallTasks(*installer_state, setup_path, opv,
                              new_version, temp_path.path(), item_list.get());
 
       // Before updating the channel values, add Chrome back to the mix so that
@@ -125,10 +123,11 @@
                                item_list.get());
 
       // Add the items to remove the quick-enable-cf command from the registry.
-      AddQuickEnableWorkItems(*installer_state, machine_state,
-                              &chrome_state->uninstall_command().GetProgram(),
-                              &chrome_state->version(),
-                              item_list.get());
+      AddQuickEnableChromeFrameWorkItems(
+          *installer_state, machine_state,
+          &chrome_state->uninstall_command().GetProgram(),
+          &chrome_state->version(),
+          item_list.get());
 
       if (!item_list->Do()) {
         item_list->Rollback();