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

chrome/installer/util/install_util.h

Index: chrome/installer/util/install_util.h
===================================================================
--- chrome/installer/util/install_util.h	(revision 72487)
+++ chrome/installer/util/install_util.h	(working copy)
@@ -15,13 +15,12 @@
 #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 {
@@ -107,6 +106,11 @@
   // 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);
 };