Remove the disable metrics command line flag, which is no longer used for

anything. This flag was leftover from initial product development when there
was no opt-in preference for enabling the metrics service.

The only user was a ChromeFrame unit test which I modified to use a different
one that has the same effect.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1290004

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

4 files changed, 2 insertions, 8 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index feaf3a9..7767231 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -134,10 +134,6 @@ const char kDisableLocalStorage[]            = "disable-local-storage";
 // builds.
 const char kDisableLogging[]                = "disable-logging";
 
-// Does nothing, use the preferences to see if the user has enabled metrics.
-// TODO(brettw) bug 39224: remove this constant.
-const char kDisableMetrics[]                = "disable-metrics";
-
 // Whether we should prevent the new tab page from showing the first run
 // notification.
 const char kDisableNewTabFirstRun[]         = "disable-new-tab-first-run";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 06cdaf3..f1997b9 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -53,7 +53,6 @@ extern const char kDisableJavaScript[];
 extern const char kDisableJava[];
 extern const char kDisableLocalStorage[];
 extern const char kDisableLogging[];
-extern const char kDisableMetrics[];
 extern const char kDisableNewTabFirstRun[];
 extern const char kDisablePlugins[];
 extern const char kDisablePopupBlocking[];
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc
index 484c6de..d786010 100644
--- a/chrome_frame/chrome_launcher.cc
+++ b/chrome_frame/chrome_launcher.cc
@@ -22,7 +22,6 @@ const wchar_t kLauncherExeBaseName[] = L"chrome_launcher.exe";
 const char* kAllowedSwitches[] = {
   switches::kAutomationClientChannelID,
   switches::kChromeFrame,
-  switches::kDisableMetrics,
   switches::kEnableRendererAccessibility,
   switches::kEnableExperimentalExtensionApis,
   switches::kNoErrorDialogs,
diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc
index 454854d..fa6efd8 100644
--- a/chrome_frame/chrome_launcher_unittest.cc
+++ b/chrome_frame/chrome_launcher_unittest.cc
@@ -31,7 +31,7 @@ class LogDisabler {
 
 TEST(ChromeLauncher, SanitizeCommandLine) {
   CommandLine bad(FilePath(L"dummy.exe"));
-  bad.AppendSwitch(switches::kDisableMetrics);  // in whitelist
+  bad.AppendSwitch(switches::kNoFirstRun);  // in whitelist
   bad.AppendSwitchWithValue(switches::kLoadExtension, L"foo");  // in whitelist
   bad.AppendSwitch("no-such-switch");  // does not exist
   bad.AppendSwitch(switches::kHomePage);  // exists but not in whitelist
@@ -40,7 +40,7 @@ TEST(ChromeLauncher, SanitizeCommandLine) {
 
   CommandLine sanitized(FilePath(L"dumbo.exe"));
   chrome_launcher::SanitizeCommandLine(bad, &sanitized);
-  EXPECT_TRUE(sanitized.HasSwitch(switches::kDisableMetrics));
+  EXPECT_TRUE(sanitized.HasSwitch(switches::kNoFirstRun));
   EXPECT_FALSE(sanitized.HasSwitch(switches::kLoadExtension));
   EXPECT_FALSE(sanitized.HasSwitch("no-such-switch"));
   EXPECT_FALSE(sanitized.HasSwitch(switches::kHomePage));