C++ reability review for gab.

chrome/installer/setup/uninstall.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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <windows.h>
 
@@ skipping 114 matching lines @@
     bool success = update_list->Do();
     LOG_IF(ERROR, !success) << "Failed updating channel values.";
   }
 }
 
 void ProcessOnOsUpgradeWorkItems(
     const installer::InstallerState& installer_state,
     const installer::Product& product) {
   scoped_ptr<WorkItemList> work_item_list(
       WorkItem::CreateNoRollbackWorkItemList());
-  AddOsUpgradeWorkItems(installer_state, NULL, NULL, product,
+  AddOsUpgradeWorkItems(installer_state, FilePath(), Version(), product,
                         work_item_list.get());
   if (!work_item_list->Do())
     LOG(ERROR) << "Failed to remove on-os-upgrade command.";
 }
 
 // Adds or removes the quick-enable-cf command to the binaries' version key in
 // the registry as needed.
 void ProcessQuickEnableWorkItems(
     const installer::InstallerState& installer_state,
     const installer::InstallationState& machine_state) {
   scoped_ptr<WorkItemList> work_item_list(
       WorkItem::CreateNoRollbackWorkItemList());
 
-  AddQuickEnableChromeFrameWorkItems(installer_state, machine_state, NULL, NULL,
-                                     work_item_list.get());
+  AddQuickEnableChromeFrameWorkItems(installer_state, machine_state, FilePath(),
+                                     Version(), work_item_list.get());
 
-  AddQuickEnableApplicationHostWorkItems(installer_state, machine_state, NULL,
-                                         NULL, work_item_list.get());
+  AddQuickEnableApplicationHostWorkItems(installer_state, machine_state,
+                                         FilePath(), Version(),
+                                         work_item_list.get());
   if (!work_item_list->Do())
     LOG(ERROR) << "Failed to update quick-enable-cf command.";
 }
 
 void ProcessIELowRightsPolicyWorkItems(
     const installer::InstallerState& installer_state) {
   scoped_ptr<WorkItemList> work_items(WorkItem::CreateNoRollbackWorkItemList());
   AddDeleteOldIELowRightsPolicyWorkItems(installer_state, work_items.get());
   work_items->Do();
   installer::RefreshElevationPolicy();
@@ skipping 112 matching lines @@
     if (!ShellUtil::RemoveChromeDesktopShortcut(
         product.distribution(),
         ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL,
         ShellUtil::SHORTCUT_NO_OPTIONS)) {
       ShellUtil::RemoveChromeDesktopShortcut(
           product.distribution(),
           ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL,
           ShellUtil::SHORTCUT_ALTERNATE);
     }
 
-    ShellUtil::RemoveChromeQuickLaunchShortcut(product.distribution(),
+    ShellUtil::RemoveChromeQuickLaunchShortcut(
+        product.distribution(),
         ShellUtil::CURRENT_USER | ShellUtil::SYSTEM_LEVEL);
   } else {
     PathService::Get(base::DIR_START_MENU, &shortcut_path);
-    if (!ShellUtil::RemoveChromeDesktopShortcut(product.distribution(),
+    if (!ShellUtil::RemoveChromeDesktopShortcut(
+        product.distribution(),
         ShellUtil::CURRENT_USER, ShellUtil::SHORTCUT_NO_OPTIONS)) {
-      ShellUtil::RemoveChromeDesktopShortcut(product.distribution(),
+      ShellUtil::RemoveChromeDesktopShortcut(
+          product.distribution(),
           ShellUtil::CURRENT_USER, ShellUtil::SHORTCUT_ALTERNATE);
     }
 
-    ShellUtil::RemoveChromeQuickLaunchShortcut(product.distribution(),
-        ShellUtil::CURRENT_USER);
+    ShellUtil::RemoveChromeQuickLaunchShortcut(
+        product.distribution(), ShellUtil::CURRENT_USER);
   }
   if (shortcut_path.empty()) {
     LOG(ERROR) << "Failed to get location for shortcut.";
   } else {
     const string16 product_name(product.distribution()->GetAppShortCutName());
     shortcut_path = shortcut_path.Append(product_name);
 
     FilePath shortcut_link(shortcut_path.Append(product_name + L".lnk"));
 
     VLOG(1) << "Unpinning shortcut at " << shortcut_link.value()
@@ skipping 362 matching lines @@
               HKEY_USERS,
               string16(L".DEFAULT\\").append(
                   ShellUtil::kRegStartMenuInternet).c_str(),
               L"", InstallUtil::ValueEquals(client_name));
         }
       }
     }
   }
 
   // Delete Software\RegisteredApplications\Chromium
-  InstallUtil::DeleteRegistryValue(root, ShellUtil::kRegRegisteredApplications,
+  InstallUtil::DeleteRegistryValue(
+      root, ShellUtil::kRegRegisteredApplications,
       dist->GetBaseAppName() + browser_entry_suffix);
 
   // Delete the App Paths and Applications keys that let Explorer find Chrome:
   // http://msdn.microsoft.com/en-us/library/windows/desktop/ee872121
   string16 app_key(ShellUtil::kRegClasses);
   app_key.push_back(FilePath::kSeparators[0]);
   app_key.append(L"Applications");
   app_key.push_back(FilePath::kSeparators[0]);
   app_key.append(installer::kChromeExe);
   InstallUtil::DeleteRegistryKey(root, app_key);
@@ skipping 508 matching lines @@
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer