summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 01:48:24 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 01:48:24 +0000
commit6453f5c5fb52736be02841ccfb8cd44788404205 (patch)
tree29d53ddb3aff4c6151c208032833fadcaa4ef95d /chrome/browser
parent63200afe8ab14639b2d04fe08044ac1950dc3764 (diff)
downloadchromium_src-6453f5c5fb52736be02841ccfb8cd44788404205.zip
chromium_src-6453f5c5fb52736be02841ccfb8cd44788404205.tar.gz
chromium_src-6453f5c5fb52736be02841ccfb8cd44788404205.tar.bz2
Enable WebSocketExperiment back
r32311 fixes the cause of the crash, so enable WebSocket experiment again. BUG=28096,27856 TEST=none Review URL: http://codereview.chromium.org/399065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_main.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 5f8c7fb..53274e2 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -839,11 +839,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
if (enabled)
metrics->Start();
}
- // TODO(ukai): Bug 28096: Implement ExperimentRunner so that it does not
- // tear down histograms early, and cause a crash.
- /*
chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
- */
}
InstallJankometer(parsed_command_line);