Revert 60963 - Merge 58701 - Relanding this:...

chrome/browser/renderer_host/test/test_render_view_host.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/renderer_host/test/test_backing_store.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ skipping 218 matching lines @@
 
 TestRenderViewHost* RenderViewHostTestHarness::active_rvh() {
   return pending_rvh() ? pending_rvh() : rvh();
 }
 
 TestingProfile* RenderViewHostTestHarness::profile() {
   return profile_.get();
 }
 
 MockRenderProcessHost* RenderViewHostTestHarness::process() {
-  if (pending_rvh())
-    return static_cast<MockRenderProcessHost*>(pending_rvh()->process());
   return static_cast<MockRenderProcessHost*>(rvh()->process());
 }
 
 void RenderViewHostTestHarness::DeleteContents() {
   contents_.reset();
 }
 
 TestTabContents* RenderViewHostTestHarness::CreateTestTabContents() {
   // See comment above profile_ decl for why we check for NULL here.
   if (!profile_.get())
@@ skipping 24 matching lines @@
   contents_.reset();
 
   // Make sure that we flush any messages related to TabContents destruction
   // before we destroy the profile.
   MessageLoop::current()->RunAllPending();
 
   // Release the profile on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, profile_.release());
   message_loop_.RunAllPending();
 }