summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 02:39:58 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 02:39:58 +0000
commitf7906654d9ffbf1385843b4c7457797564273a56 (patch)
tree0768ef534a78df9505dc6d25d801488c36c17775
parent9f1dd654dcfa8b84f2ee5718e1dc0daf0b9cdf89 (diff)
downloadchromium_src-f7906654d9ffbf1385843b4c7457797564273a56.zip
chromium_src-f7906654d9ffbf1385843b4c7457797564273a56.tar.gz
chromium_src-f7906654d9ffbf1385843b4c7457797564273a56.tar.bz2
Stop top-crasher regression by disabling WebSocketExperimentRunner
There was a race to destroy histograms held by an instance within WebSocketExperimentRunner, and this was causing the crash when histograms were being recorded at shutdown. See bug 28096 for re-enabling this feature. BUG=27856 r=wtc,ukai Review URL: http://codereview.chromium.org/404017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32263 0039d316-1c4b-4281-b951-d872f2087c98
-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 b61007a..414e253 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -842,7 +842,11 @@ 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);