1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index 82aff43..6778eb9 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -60,7 +60,7 @@ class RenderViewTest : public testing::Test {
 
   // testing::Test
   virtual void SetUp() {
-    MockProcess::GlobalInit();
+    mock_process_.reset(new MockProcess());
 
     render_thread_.set_routing_id(kRouteId);
 
@@ -77,15 +77,13 @@ class RenderViewTest : public testing::Test {
 
     view_ = NULL;
 
-    // There is a delayed task that the child process posts to terminate the
-    // message loop so we need to spin the message loop to delete the task.
-    MockProcess::GlobalCleanup();
-    msg_loop_.Run();
+    mock_process_.reset();
+    msg_loop_.RunAllPending();
   }
 
   MessageLoop msg_loop_;
   MockRenderThread render_thread_;
-
+  scoped_ptr<MockProcess> mock_process_;
   scoped_refptr<RenderView> view_;
 };