diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 04:53:11 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 04:53:11 +0000 |
| commit | f48ef0370d336fee1deb1c697c5c4d9b16e0c8d2 (patch) | |
| tree | da484dc3c59ec87c34ee5a948de8e7f0069ba402 /chrome/browser/browser_main.cc | |
| parent | c291f3ffac92b611e1eff1fcb9037bfbb0950dab (diff) | |
| download | chromium_src-f48ef0370d336fee1deb1c697c5c4d9b16e0c8d2.zip chromium_src-f48ef0370d336fee1deb1c697c5c4d9b16e0c8d2.tar.gz chromium_src-f48ef0370d336fee1deb1c697c5c4d9b16e0c8d2.tar.bz2 | |
Run WebSocket experiment if reporting is active.
BUG=44626
TEST=none
Review URL: http://codereview.chromium.org/2093009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 9647314..1ccb00f 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -497,8 +497,11 @@ 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(); + } #endif } @@ -1156,7 +1159,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) |