Consolidate most CommandLine code across platforms.

Significant refactoring with some notable behavior changes:
1. Switches are appended preceding existing arguments (after other swtiches).
2. (Windows) command_line_string() is generated and properly quoted/escaped.
3. Appended switches will retain their (optional) included prefixes (--,-,/).
Notable internal changes (shouldn't affect behavior):
1. (Windows) Generate the cl string, instead of storing&updating the original.
2. Explicitly retain switch prefixes (--,-,/) (was automatic in init*/ctor).
Update (obvious) code expecting switches to be appended antecedent to args.
Add Nico's test from: codereview.chromium.org/6728016/.

An intermediary CL landed between patch set 3 and 4, see:
http://codereview.chromium.org/6596020

BUG=73195,67764
TEST=Commandline usage.

Review URL: http://codereview.chromium.org/6526040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85360 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 17 deletions

diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index 480e5df..6724ca2 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -356,25 +356,10 @@ int InstallUtil::GetInstallReturnCode(installer::InstallStatus status) {
 }
 
 // static
-void InstallUtil::MakeUninstallCommand(const std::wstring& exe_path,
+void InstallUtil::MakeUninstallCommand(const std::wstring& program,
                                        const std::wstring& arguments,
                                        CommandLine* command_line) {
-  const bool no_program = exe_path.empty();
-
-  // Return a bunch of nothingness.
-  if (no_program && arguments.empty()) {
-    *command_line = CommandLine(CommandLine::NO_PROGRAM);
-  } else {
-    // Form a full command line string.
-    std::wstring command;
-    command.append(1, L'"')
-        .append(no_program ? L"" : exe_path)
-        .append(L"\" ")
-        .append(arguments);
-
-    // If we have a program name, return this complete command line.
-    *command_line = CommandLine::FromString(command);
-  }
+  *command_line = CommandLine::FromString(L"\"" + program + L"\" " + arguments);
 }
 
 std::wstring InstallUtil::GetCurrentDate() {