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

6 files changed, 12 insertions, 21 deletions

diff --git a/base/command_line.cc b/base/command_line.cc
index acf2502..ff89e1a 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -290,10 +290,6 @@ CommandLine::StringType CommandLine::GetSwitchValueNative(
   return result == switches_.end() ? StringType() : result->second;
 }
 
-size_t CommandLine::GetSwitchCount() const {
-  return switches_.size();
-}
-
 void CommandLine::AppendSwitch(const std::string& switch_string) {
   AppendSwitchNative(switch_string, StringType());
 }
diff --git a/base/command_line.h b/base/command_line.h
index d9f3138..4b40133 100644
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -99,10 +99,6 @@ class BASE_API CommandLine {
   FilePath GetSwitchValuePath(const std::string& switch_string) const;
   StringType GetSwitchValueNative(const std::string& switch_string) const;
 
-  // Get the number of switches in this process.
-  // TODO(msw): Remove unnecessary API.
-  size_t GetSwitchCount() const;
-
   // Get a copy of all switches, along with their values.
   const SwitchMap& GetSwitches() const { return switches_; }
 
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index ed6b5ce..19d18084 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -782,10 +782,10 @@ void MetricsService::InitializeMetricsState() {
     UMA_HISTOGRAM_COUNTS_100("Chrome.CommandLineAppModeCount", 1);
   }
 
-  UMA_HISTOGRAM_COUNTS_100("Chrome.CommandLineFlagCount",
-                           command_line->GetSwitchCount());
+  size_t switch_count = command_line->GetSwitches().size();
+  UMA_HISTOGRAM_COUNTS_100("Chrome.CommandLineFlagCount", switch_count);
   UMA_HISTOGRAM_COUNTS_100("Chrome.CommandLineUncommonFlagCount",
-                           command_line->GetSwitchCount() - common_commands);
+                           switch_count - common_commands);
 
   // Kick off the process of saving the state (so the uptime numbers keep
   // getting updated) every n minutes.
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());
   }
 }
 
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index f9a70ba..00a765d 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -38,8 +38,7 @@ int main(int argc, const char* argv[]) {
 
   TestTimeouts::Initialize();
 
-  if (command_line->GetSwitchCount() == 0 ||
-      command_line->HasSwitch("help")) {
+  if (command_line->GetSwitches().empty() || command_line->HasSwitch("help")) {
     PrintUsage();
     return -1;
   }