Nix CommandLine::GetSwitchCount.

BUG=73195
TEST=none

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

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

2 files changed, 8 insertions, 8 deletions

diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc
index b579746..9b12075d 100644
--- a/chrome/installer/util/install_util_unittest.cc
+++ b/chrome/installer/util/install_util_unittest.cc
@@ -41,9 +41,9 @@ TEST_F(InstallUtilTest, MakeUninstallCommand) {
     InstallUtil::MakeUninstallCommand(param.first, param.second, &command_line);
     EXPECT_EQ(param.first, command_line.GetProgram().value());
     if (param.second.empty()) {
-      EXPECT_EQ(0U, command_line.GetSwitchCount());
+      EXPECT_TRUE(command_line.GetSwitches().empty());
     } else {
-      EXPECT_EQ(2U, command_line.GetSwitchCount());
+      EXPECT_EQ(2U, command_line.GetSwitches().size());
       EXPECT_TRUE(command_line.HasSwitch("do-something"));
       EXPECT_TRUE(command_line.HasSwitch("silly"));
     }
diff --git a/chrome/installer/util/product_state_unittest.cc b/chrome/installer/util/product_state_unittest.cc
index b6c228f..ad81ed8 100644
--- a/chrome/installer/util/product_state_unittest.cc
+++ b/chrome/installer/util/product_state_unittest.cc
@@ -284,7 +284,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_TRUE(state.GetSetupPath().empty());
     EXPECT_TRUE(state.uninstall_command().command_line_string().empty());
-    EXPECT_EQ(0U, state.uninstall_command().GetSwitchCount());
+    EXPECT_TRUE(state.uninstall_command().GetSwitches().empty());
   }
 
   // Empty values.
@@ -294,7 +294,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_TRUE(state.GetSetupPath().empty());
     EXPECT_TRUE(state.uninstall_command().command_line_string().empty());
-    EXPECT_EQ(0U, state.uninstall_command().GetSwitchCount());
+    EXPECT_TRUE(state.uninstall_command().GetSwitches().empty());
   }
 
   // Uninstall command without exe.
@@ -304,7 +304,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_TRUE(state.GetSetupPath().empty());
     EXPECT_EQ(L" --uninstall", state.uninstall_command().command_line_string());
-    EXPECT_EQ(1U, state.uninstall_command().GetSwitchCount());
+    EXPECT_EQ(1U, state.uninstall_command().GetSwitches().size());
   }
 
   // Uninstall command without args.
@@ -314,7 +314,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     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(0U, state.uninstall_command().GetSwitchCount());
+    EXPECT_TRUE(state.uninstall_command().GetSwitches().empty());
   }
 
   // Uninstall command with exe that requires quoting.
@@ -325,7 +325,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     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());
+    EXPECT_TRUE(state.uninstall_command().GetSwitches().empty());
   }
 
   // Uninstall command with both exe and args.
@@ -336,7 +336,7 @@ TEST_F(ProductStateTest, InitializeUninstallCommand) {
     EXPECT_EQ(L"setup.exe", state.GetSetupPath().value());
     EXPECT_EQ(L"setup.exe --uninstall",
               state.uninstall_command().command_line_string());
-    EXPECT_EQ(1U, state.uninstall_command().GetSwitchCount());
+    EXPECT_EQ(1U, state.uninstall_command().GetSwitches().size());
   }
 }