diff options
author | sky <sky@chromium.org> | 2014-09-26 16:35:39 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 23:35:58 +0000 |
commit | d9875966d9cf432f2f4cb8ca1d8dda9ee5cec701 (patch) | |
tree | 6efcd05df86ca1f232c082b6ae17ca15b82a843c /chrome/browser/chrome_browser_main.cc | |
parent | 172379d53ad5be5b92d34f179409d50aa9e36630 (diff) | |
download | chromium_src-d9875966d9cf432f2f4cb8ca1d8dda9ee5cec701.zip chromium_src-d9875966d9cf432f2f4cb8ca1d8dda9ee5cec701.tar.gz chromium_src-d9875966d9cf432f2f4cb8ca1d8dda9ee5cec701.tar.bz2 |
Makes it so we don't start watchdog when running under debugger
There is nothing worse than stepping through the debugger and suddenly
hitting the watchdog timer DCHECK. If you're running under a debugger
seems like you don't care about the watchdog thread. So, make it so we
don't start watchdog in this case.
BUG=none
TEST=none
R=rtenneti@chromium.org
Review URL: https://codereview.chromium.org/573683003
Cr-Commit-Position: refs/heads/master@{#297071}
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
-rw-r--r-- | chrome/browser/chrome_browser_main.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index ed87ac2..fae3771 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -1082,9 +1082,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { StartMetricsRecording(); #endif - // Create watchdog thread after creating all other threads because it will - // watch the other threads and they must be running. - browser_process_->watchdog_thread(); + if (!base::debug::BeingDebugged()) { + // Create watchdog thread after creating all other threads because it will + // watch the other threads and they must be running. + browser_process_->watchdog_thread(); + } // Do any initializating in the browser process that requires all threads // running. |