diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 00:35:59 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 00:35:59 +0000 |
| commit | 56bdb7116d7b3b4404ae5caf95f85d832aaad259 (patch) | |
| tree | 83df98a9b474780fe04fad6d349371b987441c5d | |
| parent | 7a6da11cb550756aa7e458024379a64b6c191351 (diff) | |
| download | chromium_src-56bdb7116d7b3b4404ae5caf95f85d832aaad259.zip chromium_src-56bdb7116d7b3b4404ae5caf95f85d832aaad259.tar.gz chromium_src-56bdb7116d7b3b4404ae5caf95f85d832aaad259.tar.bz2 | |
Shutdown timebomb - Crash after 5 mins in Canary and 50 mins
in Dev and Beta and 100 mins in Stable channel.
Small change so that we can file bugs on crashes in Canary.
BUG=110124
R=jar
TEST=browser tests
Review URL: http://codereview.chromium.org/9234049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119313 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index da8b53f..57143d4 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -1830,7 +1830,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) { void ChromeBrowserMainParts::PostMainMessageLoopRun() { // Start watching for jank during shutdown. It gets disarmed when // |shutdown_watcher_| object is destructed. - shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(90)); + shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); // Disarm the startup hang detector time bomb if it is still Arm'ed. startup_watcher_->Disarm(); diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index e9e1f4b..4328ad9 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -906,10 +906,10 @@ void ShutdownWatcherHelper::Arm(const base::TimeDelta& duration) { chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); if (channel == chrome::VersionInfo::CHANNEL_STABLE) { - actual_duration *= 50; + actual_duration *= 20; } else if (channel == chrome::VersionInfo::CHANNEL_BETA || channel == chrome::VersionInfo::CHANNEL_DEV) { - actual_duration *= 25; + actual_duration *= 10; } #if defined(OS_WIN) |