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

chrome/installer/setup/chrome_frame_quick_enable.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/chrome_frame_quick_enable.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 82 matching lines @@
       DCHECK(chrome_state);  // Checked in CheckQuickEnablePreconditions.
 
       // Temporarily remove Chrome from the product list.
       // This is so that the operations below do not affect the installation
       // state of Chrome.
       installer_state->RemoveProduct(
           installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER));
 
       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,
                                     item_list.get(), *cf);
       // Always set the "lang" value since quick-enable always happens in the
       // context of an interactive session with a user.
       AddVersionKeyWorkItems(installer_state->root_key(), cf->distribution(),
                              new_version, true, item_list.get());
       AddChromeFrameWorkItems(machine_state, *installer_state, setup_path,
                               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
       // all multi-installed products' channel values get updated.
       installer_state->AddProductFromState(BrowserDistribution::CHROME_BROWSER,
                                            *chrome_state);
       AddGoogleUpdateWorkItems(machine_state, *installer_state,
                                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();
         status = INSTALL_FAILED;
       } else {
         DCHECK_EQ(FIRST_INSTALL_SUCCESS, status);
         VLOG(1) << "Chrome Frame successfully activated.";
       }
     }
   }
@@ skipping 21 matching lines @@
                 BrowserDistribution::CHROME_BINARIES),
             true)) {
       LOG(ERROR) << "Failed to set EULA consent for multi-install binaries.";
     }
   }
 
   return status;
 }
 
 }  // namespace installer