C++ reability review for gab.

chrome/installer/setup/install_worker_unittest.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/install_worker.h"
 
 #include "base/win/registry.h"
 #include "base/version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/delete_reg_key_work_item.h"
@@ skipping 442 matching lines @@
   // TODO(robertshield): Set up some real expectations.
   EXPECT_CALL(work_item_list, AddCopyTreeWorkItem(_, _, _, _, _))
       .Times(AtLeast(1));
 
   AddInstallWorkItems(*installation_state.get(),
                       *installer_state.get(),
                       setup_path_,
                       archive_path_,
                       src_path_,
                       temp_dir_,
+                      current_version_.get(),
                       *new_version_.get(),
-                      &current_version_,
                       &work_item_list);
 }
 
 namespace {
 
 const wchar_t elevation_key[] =
     L"SOFTWARE\\Microsoft\\Internet Explorer\\Low Rights\\ElevationPolicy\\"
     L"{E0A900DF-9611-4446-86BD-4B1D47E7DB2A}";
 const wchar_t old_elevation_key[] =
     L"SOFTWARE\\Microsoft\\Internet Explorer\\Low Rights\\ElevationPolicy\\"
@@ skipping 242 matching lines @@
     L"Software\\Google\\Update\\Clients\\"
     L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}\\Commands\\quick-enable-cf";
 
 TEST_F(QuickEnableAbsentTest, CleanInstallSingleChrome) {
   // Install single Chrome on a clean system.
   scoped_ptr<MockInstallerState> installer_state(
       BuildChromeInstallerState(system_level_, false, *machine_state_,
                                 InstallerState::SINGLE_INSTALL_OR_UPDATE));
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnableAbsentTest, CleanInstallSingleChromeFrame) {
   // Install single Chrome Frame on a clean system.
   scoped_ptr<MockInstallerState> installer_state(
       BuildChromeFrameInstallerState(system_level_, false, false,
                                      *machine_state_,
                                      InstallerState::SINGLE_INSTALL_OR_UPDATE));
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeFrame) {
   // Install multi Chrome Frame on a clean system.
   scoped_ptr<MockInstallerState> installer_state(
       BuildChromeFrameInstallerState(system_level_, true, false,
                                      *machine_state_,
                                      InstallerState::MULTI_INSTALL));
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeChromeFrame) {
   // Install multi Chrome and Chrome Frame on a clean system.
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, true, *machine_state_,
                                InstallerState::MULTI_INSTALL));
   AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
   AddChromeToInstallerState(*machine_state_, installer_state.get());
   AddChromeFrameToInstallerState(*machine_state_, false,
                                  installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveMultiChromeFrame) {
   // Uninstall multi Chrome on a machine with multi Chrome Frame.
   AddChromeToInstallationState(system_level_, true, false,
                                machine_state_.get());
   AddChromeFrameToInstallationState(system_level_, true, false,
                                     machine_state_.get());
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, true, *machine_state_,
                                InstallerState::UNINSTALL));
   AddChromeToInstallerState(*machine_state_, installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveSingleChromeFrame) {
   // Uninstall multi Chrome on a machine with single Chrome Frame.
   AddChromeToInstallationState(system_level_, true, false,
                                machine_state_.get());
   AddChromeFrameToInstallationState(system_level_, false, false,
                                     machine_state_.get());
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, true, *machine_state_,
                                InstallerState::UNINSTALL));
   AddChromeToInstallerState(*machine_state_, installer_state.get());
   AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnableAbsentTest, AcceptReadyMode) {
   // Accept ready-mode.
   AddChromeToInstallationState(system_level_, true, true,
                                machine_state_.get());
   AddChromeFrameToInstallationState(system_level_, true, true,
                                     machine_state_.get());
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, true, *machine_state_,
                                InstallerState::UNINSTALL));
   AddChromeToInstallerState(*machine_state_, installer_state.get());
   AddChromeFrameToInstallerState(*machine_state_, false, installer_state.get());
   AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 // Test scenarios under which the quick-enable-cf command should exist after the
 // run.
 class QuickEnablePresentTest : public InstallWorkerTest {
  public:
   virtual void SetUp() {
     InstallWorkerTest::SetUp();
     root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ skipping 43 matching lines @@
     L"Software\\Google\\Update\\Clients\\"
     L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}\\Commands\\quick-enable-cf";
 
 TEST_F(QuickEnablePresentTest, CleanInstallMultiChrome) {
   // Install multi Chrome on a clean system.
   scoped_ptr<MockInstallerState> installer_state(
       BuildChromeInstallerState(system_level_, true, *machine_state_,
                                 InstallerState::MULTI_INSTALL));
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnablePresentTest, CleanInstallMultiChromeReadyMode) {
   // Install multi Chrome with Chrome Frame ready-mode on a clean system.
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, true, *machine_state_,
                                InstallerState::MULTI_INSTALL));
   AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
   AddChromeToInstallerState(*machine_state_, installer_state.get());
   AddChromeFrameToInstallerState(*machine_state_, true,
                                  installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnablePresentTest, UninstallSingleChromeFrame) {
   // Uninstall single Chrome Frame on a machine with multi Chrome.
   AddChromeToInstallationState(system_level_, true, false,
                                machine_state_.get());
   AddChromeFrameToInstallationState(system_level_, false, false,
                                     machine_state_.get());
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, false, *machine_state_,
                                InstallerState::UNINSTALL));
   AddChromeFrameToInstallerState(*machine_state_, false, installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 TEST_F(QuickEnablePresentTest, UninstallMultiChromeFrame) {
   // Uninstall multi Chrome Frame on a machine with multi Chrome.
   AddChromeToInstallationState(system_level_, true, false,
                                machine_state_.get());
   AddChromeFrameToInstallationState(system_level_, true, false,
                                     machine_state_.get());
   scoped_ptr<MockInstallerState> installer_state(
       BuildBasicInstallerState(system_level_, true, *machine_state_,
                                InstallerState::UNINSTALL));
   AddChromeFrameToInstallerState(*machine_state_, false, installer_state.get());
   AddQuickEnableChromeFrameWorkItems(*installer_state,
                                      *machine_state_,
-                                     &setup_path_,
-                                     new_version_.get(),
+                                     setup_path_,
+                                     *new_version_.get(),
                                      &work_item_list_);
 }
 
 #endif  // defined(GOOGLE_CHROME_BUILD)