diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 19:15:37 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 19:15:37 +0000 |
commit | 7603d7f7d625bd27aa98fbdd28b8cff83344f66f (patch) | |
tree | aa2c6325792255464122043fd65259cf21232ec0 /chrome_frame | |
parent | a9f2b293243afb1b3508ffe9936d0cbd7bcbb243 (diff) | |
download | chromium_src-7603d7f7d625bd27aa98fbdd28b8cff83344f66f.zip chromium_src-7603d7f7d625bd27aa98fbdd28b8cff83344f66f.tar.gz chromium_src-7603d7f7d625bd27aa98fbdd28b8cff83344f66f.tar.bz2 |
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
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/chrome_launcher.cc | 1 | ||||
-rw-r--r-- | chrome_frame/chrome_launcher_unittest.cc | 4 |
2 files changed, 2 insertions, 3 deletions
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)); |