diff options
| author | haven@chromium.org <haven@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 00:37:43 +0000 |
|---|---|---|
| committer | haven@chromium.org <haven@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 00:37:43 +0000 |
| commit | b9fe6be3e3d0747a25a3f790d402db4b8cb9b1ab (patch) | |
| tree | b9b352adcc8ab0f81dfd7bd0b7f3600a70d46bef /content/utility | |
| parent | b08cefa42ace30ff6d159ecd7f13cab7b1ccab5a (diff) | |
| download | chromium_src-b9fe6be3e3d0747a25a3f790d402db4b8cb9b1ab.zip chromium_src-b9fe6be3e3d0747a25a3f790d402db4b8cb9b1ab.tar.gz chromium_src-b9fe6be3e3d0747a25a3f790d402db4b8cb9b1ab.tar.bz2 | |
Fixes up batch-mode release of utility process.
When running in single-process mode, e.g. during unit tests, the utility
process cannot terminate the process and instead closes its channel to trigger
cleanup. Ending batchmode triggers process termination for the multi-process
mode, but does nothing during single-process mode, leading to test timeout.
This can be fixed by adding the single-process mode logic to the EndBatchMode
code path.
BUG=341935
Review URL: https://codereview.chromium.org/157783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
| -rw-r--r-- | content/utility/utility_thread_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 6151de6..6fa43c8 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -118,7 +118,8 @@ void UtilityThreadImpl::OnBatchModeStarted() { } void UtilityThreadImpl::OnBatchModeFinished() { - ChildProcess::current()->ReleaseProcess(); + batch_mode_ = false; + ReleaseProcessIfNeeded(); } #if defined(OS_POSIX) |