Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2318)

Unified Diff: chrome/browser/browser_main.cc

Issue 2093009: Run WebSocket experiment if reporting is active. (Closed)
Patch Set: Fix for tony's review Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/net/websocket_experiment/websocket_experiment_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 9647314870ce3a3e22d028091f26970b2d3a189b..7c239aa07629d21d0f96a807428d6260c250109c 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -497,8 +497,10 @@ MetricsService* InitializeMetrics(const CommandLine& parsed_command_line,
#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();
tony 2010/05/20 04:34:46 Nit: 80 cols.
+ }
#endif
}
@@ -1156,7 +1158,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
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)
« no previous file with comments | « no previous file | chrome/browser/net/websocket_experiment/websocket_experiment_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698