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

2 files changed, 4 insertions, 15 deletions

diff --git a/chrome/renderer/render_process_unittest.cc b/chrome/renderer/render_process_unittest.cc
index ef98907..848b53b 100644
--- a/chrome/renderer/render_process_unittest.cc
+++ b/chrome/renderer/render_process_unittest.cc
@@ -13,27 +13,16 @@ namespace {
 class RenderProcessTest : public testing::Test {
  public:
   virtual void SetUp() {
-    // Need a MODE_SERVER to make MODE_CLIENTs (like a RenderThread) happy.
-    channel_ = new IPC::Channel(L"render_process_unittest", IPC::Channel::MODE_SERVER, NULL);
     render_process_.reset(new RenderProcess(L"render_process_unittest"));
   }
 
   virtual void TearDown() {
-    message_loop_.RunAllPending();
     render_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_;
-  }
+    }
 
   private:
    MessageLoopForIO message_loop_;
    scoped_ptr<RenderProcess> render_process_;
-   IPC::Channel *channel_;
 };
 
 
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: