CommandLine refactoring and cleanup.

chrome/installer/util/product_state_unittest.cc

Index: chrome/installer/util/product_state_unittest.cc
diff --git a/chrome/installer/util/product_state_unittest.cc b/chrome/installer/util/product_state_unittest.cc
index c6031359412cb44e5c541477c59069af0ef16726..b6c228fdc8213e5e9f1d6be47da54826b6cd3923 100644
--- a/chrome/installer/util/product_state_unittest.cc
+++ b/chrome/installer/util/product_state_unittest.cc
@@ -303,8 +303,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     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());
   }
 
@@ -314,8 +313,18 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     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());
   }
 
@@ -325,7 +334,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     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());
   }