summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 06:59:38 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 06:59:38 +0000
commit7c7377aa746c05b3cfd0cb4b61c3514b7ea38d0f (patch)
tree783a06a8981cb80103c26cc36366a15d49f5f2f1 /chrome/browser/browser_main.cc
parent6a781684b760689def3447b084493ca7e1877a82 (diff)
downloadchromium_src-7c7377aa746c05b3cfd0cb4b61c3514b7ea38d0f.zip
chromium_src-7c7377aa746c05b3cfd0cb4b61c3514b7ea38d0f.tar.gz
chromium_src-7c7377aa746c05b3cfd0cb4b61c3514b7ea38d0f.tar.bz2
WebSocket Live Experiment
BUG=none TEST=none Review URL: http://codereview.chromium.org/369002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 6475c88..78e35dc 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -39,6 +39,7 @@
#include "chrome/browser/net/dns_global.h"
#include "chrome/browser/net/metadata_url_request.h"
#include "chrome/browser/net/sdch_dictionary_fetcher.h"
+#include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h"
#include "chrome/browser/plugin_service.h"
#include "chrome/browser/process_singleton.h"
#include "chrome/browser/profile_manager.h"
@@ -831,7 +832,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
if (enabled)
metrics->Start();
}
+ chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
}
+
InstallJankometer(parsed_command_line);
#if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
@@ -877,6 +880,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
RunUIMessageLoop(browser_process.get());
}
}
+ chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Stop();
process_singleton.Cleanup();