diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:44:38 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:44:38 +0000 |
| commit | a2841bec7d49e5d4f87a2d430fd1db34d7584238 (patch) | |
| tree | aa56f3fd07408a71083101d624e78bf3c64f2636 | |
| parent | 7e9e816b1c36b33323cf021388436fb29ae9a5f8 (diff) | |
| download | chromium_src-a2841bec7d49e5d4f87a2d430fd1db34d7584238.zip chromium_src-a2841bec7d49e5d4f87a2d430fd1db34d7584238.tar.gz chromium_src-a2841bec7d49e5d4f87a2d430fd1db34d7584238.tar.bz2 | |
Disable arming of Startup Timebomb in all channels
until we fix breakpad code to upload crash dump
without crashing.
BUG=110055
R=jar@chromium.org
TEST=browser unit tests
Review URL: https://chromiumcodereview.appspot.com/9337005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120862 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index e0551ae..8698907 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -844,8 +844,11 @@ StartupTimeBomb::~StartupTimeBomb() { void StartupTimeBomb::Arm(const base::TimeDelta& duration) { DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId()); DCHECK(!startup_watchdog_); - startup_watchdog_ = new StartupWatchDogThread(duration); - startup_watchdog_->Arm(); + // TODO(rtenneti): http://crbug.com/112970. Don't arm the startup timebomb + // until we fix breakpad code not to crash in logging::DumpWithoutCrashing(). + // startup_watchdog_ = new StartupWatchDogThread(duration); + // startup_watchdog_->Arm(); + return; } void StartupTimeBomb::Disarm() { |