Revert "Revert 249676 "Have the unload event execute in background on cr...""

content/public/test/test_renderer_host.cc

 // Copyright (c) 2012 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 "content/public/test/test_renderer_host.h"
 
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 28 matching lines @@
 // static
 RenderViewHost* RenderViewHostTester::GetPendingForController(
     NavigationController* controller) {
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       controller->GetWebContents());
   return web_contents->GetRenderManagerForTesting()->pending_render_view_host();
 }
 
 // static
 bool RenderViewHostTester::IsRenderViewHostSwappedOut(RenderViewHost* rvh) {
-  return static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out();
+  return static_cast<RenderViewHostImpl*>(rvh)->rvh_state() ==
+         RenderViewHostImpl::STATE_SWAPPED_OUT;
 }
 
 // static
 bool RenderViewHostTester::TestOnMessageReceived(RenderViewHost* rvh,
                                                  const IPC::Message& msg) {
   return static_cast<RenderViewHostImpl*>(rvh)->OnMessageReceived(msg);
 }
 
 // static
 bool RenderViewHostTester::HasTouchEventHandler(RenderViewHost* rvh) {
@@ skipping 152 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content