CommandLine refactoring and cleanup.

chrome/installer/util/product_state_unittest.cc

 // Copyright (c) 2011 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 <windows.h>
 
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 285 matching lines @@
     EXPECT_TRUE(state.uninstall_command().command_line_string().empty());
     EXPECT_EQ(0U, state.uninstall_command().GetSwitchCount());
   }
 
   // Uninstall command without exe.
   {
     ProductState state;
     ApplyUninstallCommand(NULL, L"--uninstall");
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_TRUE(state.GetSetupPath().empty());
-    EXPECT_EQ(L"\"\" --uninstall",
-              state.uninstall_command().command_line_string());
+    EXPECT_EQ(L" --uninstall", state.uninstall_command().command_line_string());
     EXPECT_EQ(1U, state.uninstall_command().GetSwitchCount());
   }
 
   // Uninstall command without args.
   {
     ProductState state;
     ApplyUninstallCommand(L"setup.exe", NULL);
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_EQ(L"setup.exe", state.GetSetupPath().value());
-    EXPECT_EQ(L"\"setup.exe\"",
-              state.uninstall_command().command_line_string());
+    EXPECT_EQ(L"setup.exe", state.uninstall_command().command_line_string());
     EXPECT_EQ(0U, state.uninstall_command().GetSwitchCount());
   }
 
+  // Uninstall command with exe that requires quoting.
+  {
+    ProductState state;
+    ApplyUninstallCommand(L"set up.exe", NULL);
+    EXPECT_TRUE(state.Initialize(system_install_, dist_));
+    EXPECT_EQ(L"set up.exe", state.GetSetupPath().value());
+    EXPECT_EQ(L"\"set up.exe\"",
+        state.uninstall_command().command_line_string());
+    EXPECT_EQ(0U, state.uninstall_command().GetSwitchCount());
+  }
+
   // Uninstall command with both exe and args.
   {
     ProductState state;
     ApplyUninstallCommand(L"setup.exe", L"--uninstall");
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_EQ(L"setup.exe", state.GetSetupPath().value());
-    EXPECT_EQ(L"\"setup.exe\" --uninstall",
+    EXPECT_EQ(L"setup.exe --uninstall",
               state.uninstall_command().command_line_string());
     EXPECT_EQ(1U, state.uninstall_command().GetSwitchCount());
   }
 }
 
 // Test extraction of the msi marker from the ClientState key.
 TEST_F(ProductStateTest, InitializeMsi) {
   MinimallyInstallProduct(L"10.0.1.1");
 
   // No msi marker.
@@ skipping 68 matching lines @@
 
   // Uninstall command with --multi-install is multi install.
   {
     ProductState state;
     ApplyUninstallCommand(L"setup.exe",
                           L"--uninstall --chrome --multi-install");
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_TRUE(state.is_multi_install());
   }
 }