diff options
| -rw-r--r-- | chrome/common/ipc_sync_channel.cc | 1 | ||||
| -rw-r--r-- | chrome/renderer/renderer_main_unittest.cc | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/chrome/common/ipc_sync_channel.cc b/chrome/common/ipc_sync_channel.cc index 7da04bc..0de4a86 100644 --- a/chrome/common/ipc_sync_channel.cc +++ b/chrome/common/ipc_sync_channel.cc @@ -309,6 +309,7 @@ void SyncChannel::SyncContext::OnMessageReceived(const Message& msg) { void SyncChannel::SyncContext::OnChannelError() { CancelPendingSends(); + shutdown_watcher_.StopWatching(); Context::OnChannelError(); } diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc index bfa3df0..f94c844 100644 --- a/chrome/renderer/renderer_main_unittest.cc +++ b/chrome/renderer/renderer_main_unittest.cc @@ -101,14 +101,7 @@ TEST_F(RendererMainTest, CreateDestroy) { // The renderer should exit when we close the channel. control_channel.Close(); - // TODO(playmobil): Remove this. - // The renderer should shut down automatically when the Channel is closed - // but there are still issues with this, leave in the kill for bringup. - base::KillProcess(renderer_pid, 9, true); - - // TODO(playmobil): Enable this. - // see comment above KillProcess() - // EXPECT_TRUE(base::WaitForSingleProcess(renderer_pid, 5000)); + EXPECT_TRUE(base::WaitForSingleProcess(renderer_pid, 5000)); } #endif // defined(OS_MACOSX) |