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

chrome/installer/setup/install_worker.h

 // 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 contains the declarations of the installer functions that build
 // the WorkItemList used to install the application.
 
 #ifndef CHROME_INSTALLER_SETUP_INSTALL_WORKER_H_
 #define CHROME_INSTALLER_SETUP_INSTALL_WORKER_H_
 
@@ skipping 45 matching lines @@
 // do a few post install tasks:
 // - Handle the case of in-use-update by updating "opv" (old version) key or
 //   deleting it if not required.
 // - Register any new dlls and unregister old dlls.
 // - If this is an MSI install, ensures that the MSI marker is set, and sets
 //   it if not.
 // If these operations are successful, the function returns true, otherwise
 // false.
 bool AppendPostInstallTasks(const InstallerState& installer_state,
                             const FilePath& setup_path,
-                            const FilePath& new_chrome_exe,
                             const Version* current_version,
                             const Version& new_version,
                             const FilePath& temp_path,
                             WorkItemList* post_install_task_list);
 
 // Builds the complete WorkItemList used to build the set of installation steps
 // needed to lay down one or more installed products.
 //
 // setup_path: Path to the executable (setup.exe) as it will be copied
 //           to Chrome install folder after install is complete
@@ skipping 98 matching lines @@
 // Refreshes the elevation policy on platforms where it is supported.
 void RefreshElevationPolicy();
 
 // Add work items to add or remove the "quick-enable-cf" to the multi-installer
 // binaries' version key on the basis of the current operation (represented in
 // |installer_state|) and the pre-existing machine configuration (represented in
 // |machine_state|).  |setup_path| (the path to the executable currently being
 // run) and |new_version| (the version of the product(s) currently being
 // installed) are required when processing product installation; they are unused
 // (and may therefore be NULL) when uninstalling.
-void AddQuickEnableWorkItems(const InstallerState& installer_state,
-                             const InstallationState& machine_state,
-                             const FilePath* setup_path,
-                             const Version* new_version,
-                             WorkItemList* work_item_list);
+void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
+                                        const InstallationState& machine_state,
+                                        const FilePath* setup_path,
+                                        const Version* new_version,
+                                        WorkItemList* work_item_list);
+
+// Add work items to add or remove the "quick-enable-application-host" command
+// to the multi-installer binaries' version key on the basis of the current
+// operation (represented in |installer_state|) and the pre-existing machine
+// configuration (represented in |machine_state|).  |setup_path| (the path to
+// the executable currently being run) and |new_version| (the version of the
+// product(s) currently being installed) are required when processing product
+// installation; they are unused (and may therefore be NULL) when uninstalling.
+void AddQuickEnableApplicationHostWorkItems(
+    const InstallerState& installer_state,
+    const InstallationState& machine_state,
+    const FilePath* setup_path,
+    const Version* new_version,
+    WorkItemList* work_item_list);
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_INSTALL_WORKER_H_