More installer refactoring in the interest of fixing some bugs and cleaning t...

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 "base/version.h"
-#include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/util_constants.h"
 
+class BrowserDistribution;
+class CommandLine;
+class Version;
 class WorkItemList;
-class BrowserDistribution;
 
 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.
@@ skipping 65 matching lines @@
                                 const std::wstring& key_path);
 
   // Deletes the registry value named value_name at path key_path under the key
   // given by reg_root.
   static bool DeleteRegistryValue(HKEY reg_root, const std::wstring& key_path,
                                   const std::wstring& value_name);
 
   // Returns zero on install success, or an InstallStatus value otherwise.
   static int GetInstallReturnCode(installer::InstallStatus install_status);
 
+  // Composes |exe_path| and |arguments| into |command_line|.
+  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__