C++ reability review for gab.

chrome/installer/setup/chrome_frame_ready_mode.cc

 // Copyright (c) 2011 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_ready_mode.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 76 matching lines @@
   }
 
   // Update Chrome's uninstallation commands to only uninstall Chrome, and add
   // an entry to the Add/Remove Programs dialog for GCF.
   DCHECK(cf->ShouldCreateUninstallEntry() || opt_in_state.is_msi());
 
   scoped_ptr<WorkItemList> item_list(WorkItem::CreateWorkItemList());
 
   // This creates the uninstallation entry for GCF.
   AddUninstallShortcutWorkItems(opt_in_state, cf_state->GetSetupPath(),
-      cf_state->version(), item_list.get(), *cf);
+      cf_state->version(), *cf, item_list.get());
   // This updates the Chrome uninstallation entries.
   AddUninstallShortcutWorkItems(opt_in_state, chrome_state->GetSetupPath(),
-      chrome_state->version(), item_list.get(), *chrome);
+      chrome_state->version(), *chrome, item_list.get());
 
   // Add a work item to delete the ChromeFrameReadyMode registry value.
   HKEY root = opt_in_state.root_key();
   item_list->AddDeleteRegValueWorkItem(root,
       opt_in_state.multi_package_binaries_distribution()->GetStateKey(),
       kChromeFrameReadyModeField);
 
   // Update the Google Update channel ("ap") value.
   AddGoogleUpdateWorkItems(machine_state, opt_in_state, item_list.get());
 
@@ skipping 119 matching lines @@
   if (!item_list->Do()) {
     LOG(ERROR) << "Failed to end temporary opt out of GCF";
     item_list->Rollback();
     status = READY_MODE_END_TEMP_OPT_OUT_FAILED;
   }
 
   return status;
 }
 
 }  // namespace installer