diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 00:44:53 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 00:44:53 +0000 |
| commit | a4f822706d208f38e26988f39d43d54a4dfd2fce (patch) | |
| tree | f84d0bd274631a3bed40c14d1750f831509dae8a /chrome/renderer/renderer_main_unittest.cc | |
| parent | b98b68ddeccfa6a9e3185f982e6917c0e3908da5 (diff) | |
| download | chromium_src-a4f822706d208f38e26988f39d43d54a4dfd2fce.zip chromium_src-a4f822706d208f38e26988f39d43d54a4dfd2fce.tar.gz chromium_src-a4f822706d208f38e26988f39d43d54a4dfd2fce.tar.bz2 | |
Fix Renderer Crash on OS X + update unit test.
The problem was that the process shutdown_event_ was created in RenderProcess::GlobalInit() and then deleted in RenderProcess::GlobalCleanup() and was being accessed after it's deletion by the MessageLoop's destructor (which was trying to signal shutdown).
MessageLoop was still retaining a reference to it since there was still an IPCSyncChannel listening on it.
IPCSyncChannel hadn't stopped listening on it since it was being terminated via OnChannelError.
This fix adds code that terminates listening on a channel when a Channel error occurs.
Review URL: http://codereview.chromium.org/20114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_main_unittest.cc')
| -rw-r--r-- | chrome/renderer/renderer_main_unittest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
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) |