Fix user-to-system-level installation delegation. This looks to have been bro...

chrome/installer/util/install_util.h

 // Copyright (c) 2010 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 declares utility functions for the installer. The original reason
 // for putting these functions in installer\util library is so that we can
 // separate out the critical logic and write unit tests for it.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
 #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__
 #pragma once
 
 #include <tchar.h>
 #include <windows.h>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
+#include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/util_constants.h"
 
-class BrowserDistribution;
-class CommandLine;
 class Version;
 class WorkItemList;
 
 namespace base {
 namespace win {
 class RegKey;
 }  // namespace win
 }  // namespace base
 
 // This is a utility class that provides common installation related
 // utility methods that can be used by installer and also unit tested
 // independently.
 class InstallUtil {
  public:
   // Launches given exe as admin on Vista.
   static bool ExecuteExeAsAdmin(const CommandLine& cmd, DWORD* exit_code);
 
   // Reads the uninstall command for Chromium from registry and returns it.
   // If system_install is true the command is read from HKLM, otherwise
   // from HKCU.
-  static std::wstring GetChromeUninstallCmd(bool system_install,
-                                            BrowserDistribution* dist);
+  static CommandLine GetChromeUninstallCmd(
+      bool system_install,
+      BrowserDistribution::Type distribution_type);
 
   // Find the version of Chrome installed on the system by checking the
   // Google Update registry key. Returns the version or NULL if no version is
   // found.
   // system_install: if true, looks for version number under the HKLM root,
   //                 otherwise looks under the HKCU.
   static Version* GetChromeVersion(BrowserDistribution* dist,
                                    bool system_install);
 
   // This function checks if the current OS is supported for Chromium.
@@ skipping 56 matching lines @@
   static void MakeUninstallCommand(const std::wstring& exe_path,
                                    const std::wstring& arguments,
                                    CommandLine* command_line);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALL_UTIL_H__