Revert 271798 "[Metrics] Make MetricsStateManager take a callbac..."

trunk/src/chrome/common/chrome_switches.cc

Index: trunk/src/chrome/common/chrome_switches.cc
===================================================================
--- trunk/src/chrome/common/chrome_switches.cc	(revision 271821)
+++ trunk/src/chrome/common/chrome_switches.cc	(working copy)
@@ -516,6 +516,12 @@
 // Enables experimentation with launching ephemeral apps via hyperlinks.
 const char kEnableLinkableEphemeralApps[]   = "enable-linkable-ephemeral-apps";
 
+// Enables metrics recording and reporting in the browser startup sequence, as
+// if this was an official Chrome build where the user allowed metrics
+// reporting. This is used for testing only.
+const char kEnableMetricsReportingForTesting[] =
+    "enable-metrics-reporting-for-testing";
+
 // Runs the Native Client inside the renderer process and enables GPU plugin
 // (internally adds lEnableGpuPlugin to the command line).
 const char kEnableNaCl[]                    = "enable-nacl";