summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_thread_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-01 01:14:31 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-01 01:14:31 +0000
commitfe6064373414f01d180a84b2d3473d5032523174 (patch)
treea245cbddee9f3afefba1f033bf5a6199cbfcaa47 /chrome/renderer/render_thread_unittest.cc
parentd6891eb663b9eaca784ac6547291212905342f9f (diff)
downloadchromium_src-fe6064373414f01d180a84b2d3473d5032523174.zip
chromium_src-fe6064373414f01d180a84b2d3473d5032523174.tar.gz
chromium_src-fe6064373414f01d180a84b2d3473d5032523174.tar.bz2
Revert my previous change. It fixed the memory leaks (see http://build.chromium.org/buildbot/waterfall/builders/XP%20Unit%20(purify)/builds/2378/steps/purify%20test:%20unit/logs/stdio), but DeleteURLAndFavicon started failing mysteriously after my checkin.
Review URL: http://codereview.chromium.org/28304 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread_unittest.cc')
-rw-r--r--chrome/renderer/render_thread_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index 808bedf..3d09c51 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -24,13 +24,13 @@ class RenderThreadTest : public testing::Test {
virtual void TearDown() {
message_loop_.RunAllPending();
mock_process_.reset();
- // Need to fully destruct IPC::SyncChannel before the message loop goes
- // away.
- message_loop_.RunAllPending();
// Delete the server channel after the RenderThread so that
// IPC::SyncChannel's OnChannelError doesn't fire on the context and attempt
// to use the listener thread which is now gone.
delete channel_;
+ // Need to fully destruct IPC::SyncChannel before the message loop goes
+ // away.
+ message_loop_.RunAllPending();
}
protected: