diff options
| author | jam <jam@chromium.org> | 2015-11-12 20:32:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 04:33:01 +0000 |
| commit | 1f8629f7b817c1ea90027416e9385848e8e0993b (patch) | |
| tree | f386e1af4493104ca18016abad9c76e6746548ca /mojo/edk/test/scoped_ipc_support.cc | |
| parent | d50d8872f18491f3b18f5af451762ce434db3060 (diff) | |
| download | chromium_src-1f8629f7b817c1ea90027416e9385848e8e0993b.zip chromium_src-1f8629f7b817c1ea90027416e9385848e8e0993b.tar.gz chromium_src-1f8629f7b817c1ea90027416e9385848e8e0993b.tar.bz2 | |
Followup to r359266 to make mojo_edk_unittests2 pass again.
BUG=478251
Review URL: https://codereview.chromium.org/1440083003
Cr-Commit-Position: refs/heads/master@{#359492}
Diffstat (limited to 'mojo/edk/test/scoped_ipc_support.cc')
| -rw-r--r-- | mojo/edk/test/scoped_ipc_support.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mojo/edk/test/scoped_ipc_support.cc b/mojo/edk/test/scoped_ipc_support.cc index c416875..6e9c11c 100644 --- a/mojo/edk/test/scoped_ipc_support.cc +++ b/mojo/edk/test/scoped_ipc_support.cc @@ -13,8 +13,7 @@ namespace test { namespace internal { -ScopedIPCSupportHelper::ScopedIPCSupportHelper() - : event_(true, false) { // Manual reset. +ScopedIPCSupportHelper::ScopedIPCSupportHelper() { } ScopedIPCSupportHelper::~ScopedIPCSupportHelper() { @@ -23,7 +22,7 @@ ScopedIPCSupportHelper::~ScopedIPCSupportHelper() { ShutdownIPCSupportOnIOThread(); } else { ShutdownIPCSupportAndWaitForNoChannels(); - event_.Wait(); + run_loop_.Run(); } } @@ -31,12 +30,11 @@ void ScopedIPCSupportHelper::Init( ProcessDelegate* process_delegate, scoped_refptr<base::TaskRunner> io_thread_task_runner) { io_thread_task_runner_ = io_thread_task_runner; - // Note: Run delegate methods on the I/O thread. InitIPCSupport(process_delegate, io_thread_task_runner_); } void ScopedIPCSupportHelper::OnShutdownCompleteImpl() { - event_.Signal(); + run_loop_.Quit(); } } // namespace internal |