C++ reability review for gab.

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_
 
 #include <windows.h>
 
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
-
 class BrowserDistribution;
 class CommandLine;
 class FilePath;
 class Version;
 class WorkItemList;
 
 namespace installer {
 
 class InstallationState;
 class InstallerState;
 class Product;
 
 // This method adds work items to create (or update) Chrome uninstall entry in
 // either the Control Panel->Add/Remove Programs list or in the Omaha client
 // state key if running under an MSI installer.
 void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
                                    const FilePath& setup_path,
                                    const Version& new_version,
-                                   WorkItemList* install_list,
-                                   const Product& product);
+                                   const Product& product,
+                                   WorkItemList* install_list);
 
 // Creates Version key for a product (if not already present) and sets the new
 // product version as the last step.  If |add_language_identifier| is true, the
 // "lang" value is also set according to the currently selected translation.
 void AddVersionKeyWorkItems(HKEY root,
                             BrowserDistribution* dist,
                             const Version& new_version,
                             bool add_language_identifier,
                             WorkItemList* list);
 
@@ skipping 25 matching lines @@
 
 // After a successful copying of all the files, this function is called to
 // 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.
+// |current_version| can be NULL to indicate no Chrome is currently installed.
 bool AppendPostInstallTasks(const InstallerState& installer_state,
                             const FilePath& setup_path,
                             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
 // archive_path: Path to the archive (chrome.7z) as it will be copied
 //               to Chrome install folder after install is complete
 // src_path: the path that contains a complete and unpacked Chrome package
 //           to be installed.
 // temp_path: the path of working directory used during installation. This path
 //            does not need to exist.
+// |current_version| can be NULL to indicate no Chrome is currently installed.
 void AddInstallWorkItems(const InstallationState& original_state,
                          const InstallerState& installer_state,
                          const FilePath& setup_path,
                          const FilePath& archive_path,
                          const FilePath& src_path,
                          const FilePath& temp_path,
+                         const Version* current_version,
                          const Version& new_version,
-                         scoped_ptr<Version>* current_version,
                          WorkItemList* install_list);
 
 // Appends registration or unregistration work items to |work_item_list| for the
 // COM DLLs whose file names are given in |dll_files| and which reside in the
 // path |dll_folder|.
 // |system_level| specifies whether to call the system or user level DLL
 // registration entry points.
 // |do_register| says whether to register or unregister.
 // |may_fail| states whether this is best effort or not. If |may_fail| is true
 // then |work_item_list| will still succeed if the registration fails and
@@ skipping 55 matching lines @@
 
 // Refreshes the elevation policy on platforms where it is supported.
 void RefreshElevationPolicy();
 
 // Adds 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.
+// (and may therefore be empty) when uninstalling.
 void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
                                         const InstallationState& machine_state,
-                                        const FilePath* setup_path,
-                                        const Version* new_version,
+                                        const FilePath& setup_path,
+                                        const Version& new_version,
                                         WorkItemList* work_item_list);
 
 // Adds 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.
+// installation; they are unused ((and may therefore be empty) when
+// uninstalling).
 void AddQuickEnableApplicationHostWorkItems(
     const InstallerState& installer_state,
     const InstallationState& machine_state,
-    const FilePath* setup_path,
-    const Version* new_version,
+    const FilePath& setup_path,
+    const Version& new_version,
     WorkItemList* work_item_list);
 
 // Adds work items to add or remove the "on-os-upgrade" command to |product|'s
 // version key on the basis of the current operation (represented in
-// |installer_state|).  |new_version| (the version of the product(s)
-// currently being installed) is required when processing product
-// installation; it is unused (and may therefore be NULL) when uninstalling.
+// |installer_state|).  |new_version| is the version of the product(s)
+// currently being installed -- can be empty on uninstall.
 void AddOsUpgradeWorkItems(const InstallerState& installer_state,
-                           const FilePath* setup_path,
-                           const Version* new_version,
+                           const FilePath& setup_path,
+                           const Version& new_version,
                            const Product& product,
                            WorkItemList* install_list);
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_INSTALL_WORKER_H_