This is the same change as 2419 minus a line of debug code I accidentally left in browser_main.cc which ignored the user preference.

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

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

2 files changed, 7 insertions, 7 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 2224e39..1cfc40e7 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -17,12 +17,12 @@ const wchar_t kDisableHangMonitor[]            = L"disable-hang-monitor";
 // Completely disables UMA metrics system.
 const wchar_t kDisableMetrics[]                = L"disable-metrics";
 
-// Disables only the sending of metrics reports.  In contrast to
-// kDisableMetrics, this executes all the code that a normal client would use
-// for reporting, except the report is dropped rather than sent to the server.
-// This is useful for finding issues in the metrics code during UI and
-// performance tests.
-const wchar_t kDisableMetricsReporting[]       = L"disable-metrics-reporting";
+// Enables the recording of metrics reports but disables reporting.
+// In contrast to kDisableMetrics, this executes all the code that a normal
+// client would use for reporting, except the report is dropped rather than sent
+// to the server. This is useful for finding issues in the metrics code during
+// UI and performance tests.
+const wchar_t kMetricsRecordingOnly[]       = L"metrics-recording-only";
 
 // Causes the browser process to throw an assertion on startup.
 const wchar_t kBrowserAssertTest[]             = L"assert-test";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 79c1d05..4c76cdc 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -13,7 +13,7 @@ namespace switches {
 
 extern const wchar_t kDisableHangMonitor[];
 extern const wchar_t kDisableMetrics[];
-extern const wchar_t kDisableMetricsReporting[];
+extern const wchar_t kMetricsRecordingOnly[];
 extern const wchar_t kBrowserAssertTest[];
 extern const wchar_t kRendererAssertTest[];
 extern const wchar_t kBrowserCrashTest[];