Fix some problems with machine level install.

chrome/installer/setup/install.cc

 // Copyright (c) 2006-2008 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 <time.h>
 
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/installer/setup/setup.h"
@@ skipping 32 matching lines @@
                                    const std::wstring& product_name,
                                    const std::wstring& new_version,
                                    WorkItemList* install_list) {
   std::wstring uninstall_cmd(L"\"");
   uninstall_cmd.append(installer::GetInstallerPathUnderChrome(install_path,
                                                               new_version));
   file_util::AppendToPath(&uninstall_cmd,
                           file_util::GetFilenameFromPath(exe_path));
   uninstall_cmd.append(L"\" --");
   uninstall_cmd.append(installer_util::switches::kUninstall);
+  if (reg_root == HKEY_LOCAL_MACHINE) {
+    uninstall_cmd.append(L" --");
+    uninstall_cmd.append(installer_util::switches::kSystemInstall);
+  }
 
   // Create DisplayName, UninstallString and InstallLocation keys
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring uninstall_reg = dist->GetUninstallRegPath();
   install_list->AddCreateRegKeyWorkItem(reg_root, uninstall_reg);
   install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
       installer_util::kUninstallDisplayNameField, product_name, true);
   install_list->AddSetRegValueWorkItem(reg_root,
                                        uninstall_reg,
                                        installer_util::kUninstallStringField,
@@ skipping 152 matching lines @@
   if (!install_list->Do()) {
     LOG(ERROR) << "Install failed, rolling back... ";
     install_list->Rollback();
     LOG(ERROR) << "Rollback complete. ";
     return false;
   }
 
   return true;
 }