Fix some problems with machine level install.

chrome/installer/setup/setup.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 <shlobj.h>
 
 #include "chrome/installer/setup/setup.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 112 matching lines @@
       (install_status == installer_util::INSTALL_REPAIRED) ||
       (file_util::PathExists(uninstall_link))) {
     if (!file_util::PathExists(shortcut_path))
       file_util::CreateDirectoryW(shortcut_path);
     std::wstring setup_exe(installer::GetInstallerPathUnderChrome(install_path,
                                                                   new_version));
     file_util::AppendToPath(&setup_exe,
                             file_util::GetFilenameFromPath(exe_path));
     std::wstring arguments(L" --");
     arguments.append(installer_util::switches::kUninstall);
+    if (system_install) {
+      arguments.append(L" --");
+      arguments.append(installer_util::switches::kSystemInstall);
+    }
+
     LOG(INFO) << "Creating/updating uninstall link at " << uninstall_link;
     std::wstring target_folder = file_util::GetDirectoryFromPath(install_path);
     ret2 = file_util::CreateShortcutLink(setup_exe.c_str(),
                                          uninstall_link.c_str(),
                                          target_folder.c_str(),
                                          arguments.c_str(),
                                          NULL,
                                          setup_exe.c_str(),
                                          0);
   }
@@ skipping 74 matching lines @@
           ShellUtil::AddChromeToSetAccessDefaults(chrome_exe, true);
       LOG(INFO) << "Return status of Chrome browser registration " << ret;
     } else {
       RemoveOldVersionDirs(install_path, new_version.GetString());
     }
   }
 
   return result;
 }