Move use of ShutdownWatcherHelper after early return

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

Committed: https://crrev.com/0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d
Cr-Commit-Position: refs/heads/master@{#383365}

[sky, 2016-03-25 19:59:07]

Description was changed from

==========
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().

BUG=none
TEST=none
R=jam@chromium.org
==========

to

==========
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
==========

[jam, 2016-03-25 20:17:38]

lgtm

[sky, 2016-03-25 20:28:47]

The CQ bit was checked by sky@chromium.org

[commit-bot: I haz the power, 2016-03-25 20:29:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1839453002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1839453002/20001

[commit-bot: I haz the power, 2016-03-25 21:27:39]

Description was changed from

==========
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
==========

to

==========
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
==========

[commit-bot: I haz the power, 2016-03-25 21:27:40]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-03-25 21:30:06]

Description was changed from

==========
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
==========

to

==========
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

Committed: https://crrev.com/0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d
Cr-Commit-Position: refs/heads/master@{#383365}
==========

[commit-bot: I haz the power, 2016-03-25 21:30:07]

Patchset 2 (id:??) landed as
https://crrev.com/0e07a14f1d8515fb5802c03e7c30dfe0bae4a87d
Cr-Commit-Position: refs/heads/master@{#383365}