diff options
| author | sky <sky@chromium.org> | 2016-03-25 14:27:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 21:29:56 +0000 |
| commit | 0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d (patch) | |
| tree | 3a37b27effc69b6f027deec8eac05bf2a772e2e1 /PRESUBMIT.py | |
| parent | 7e3a03855688b46f3abad63dc94093b09e5a6f4b (diff) | |
| download | chromium_src-0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d.zip chromium_src-0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d.tar.gz chromium_src-0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d.tar.bz2 | |
Move use of ShutdownWatcherHelper after early return
The ShutdownWatcherHelper is only needed if we don't early return,
additionally the early return triggers a DCHECK because
ShutdownWatcherHelper gets destroyed on the UI thread, triggering a
threading assertion because it ends up calling Join().
Also add ScopedAllowIO, in case Terminate fails. If SessionEnding returns we're going to be destroyed by the OS anyway, so we don't really care about any additional IO.
BUG=none
TEST=none
R=jam@chromium.org
Review URL: https://codereview.chromium.org/1839453002
Cr-Commit-Position: refs/heads/master@{#383365}
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index aee7722..1f257b1 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -168,6 +168,7 @@ _BANNED_CPP_FUNCTIONS = ( r"^base[\\\/]process[\\\/]process_metrics_linux\.cc$", r"^blimp[\\\/]engine[\\\/]app[\\\/]blimp_browser_main_parts\.cc$", r"^chrome[\\\/]browser[\\\/]chromeos[\\\/]boot_times_recorder\.cc$", + r"^chrome[\\\/]browser[\\\/]lifetime[\\\/]application_lifetime\.cc$", r"^chrome[\\\/]browser[\\\/]chromeos[\\\/]" "customization_document_browsertest\.cc$", r"^components[\\\/]crash[\\\/]app[\\\/]breakpad_mac\.mm$", |