Merge 47775 - Run WebSocket experiment if reporting is active....

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 47795)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -485,8 +485,11 @@
 #if defined(GOOGLE_CHROME_BUILD)
     bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
     metrics->SetUserPermitsUpload(enabled);
-    if (enabled)
+    if (enabled) {
       metrics->Start();
+      chrome_browser_net_websocket_experiment::
+          WebSocketExperimentRunner::Start();
+    }
 #endif
   }
 
@@ -1118,7 +1121,6 @@
   sdch_manager.EnableSdchSupport(sdch_supported_domain);
 
   MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state);
-  chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
   InstallJankometer(parsed_command_line);
 
 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)