Index: content/browser/renderer_host/test_render_view_host.cc |
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc |
index d29c0cece8fc7cc76c807588e9be698470c6cc52..69bbc179edb85b97a01d8922a1ffed3dca76c54c 100644 |
--- a/content/browser/renderer_host/test_render_view_host.cc |
+++ b/content/browser/renderer_host/test_render_view_host.cc |
@@ -62,8 +62,10 @@ TestRenderViewHost* TestRenderViewHost::GetPendingForController( |
TestRenderViewHost::TestRenderViewHost(SiteInstance* instance, |
RenderViewHostDelegate* delegate, |
int routing_id) |
- : RenderViewHost(instance, delegate, routing_id, |
- kInvalidSessionStorageNamespaceId), |
+ : RenderViewHostImpl(instance, |
+ delegate, |
+ routing_id, |
+ kInvalidSessionStorageNamespaceId), |
render_view_created_(false), |
delete_counter_(NULL), |
simulate_fetch_via_proxy_(false), |
@@ -79,7 +81,7 @@ TestRenderViewHost::~TestRenderViewHost() { |
++*delete_counter_; |
// Since this isn't a traditional view, we have to delete it. |
- delete view(); |
+ delete GetView(); |
} |
bool TestRenderViewHost::CreateRenderView(const string16& frame_name, |
@@ -93,6 +95,11 @@ bool TestRenderViewHost::IsRenderViewLive() const { |
return render_view_created_; |
} |
+// static |
+bool TestRenderViewHost::IsRenderViewHostSwappedOut(RenderViewHost* rwh) { |
+ return static_cast<RenderViewHostImpl*>(rwh)->is_swapped_out(); |
+} |
+ |
bool TestRenderViewHost::TestOnMessageReceived(const IPC::Message& msg) { |
return OnMessageReceived(msg); |
} |
@@ -149,8 +156,8 @@ void TestRenderViewHost::set_contents_mime_type(const std::string& mime_type) { |
namespace content { |
TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh) |
- : is_showing_(false) { |
- rwh_ = static_cast<RenderWidgetHostImpl*>(rwh); |
+ : rwh_(RenderWidgetHostImpl::From(rwh)), |
+ is_showing_(false) { |
} |
TestRenderWidgetHostView::~TestRenderWidgetHostView() { |
@@ -364,8 +371,8 @@ content::BrowserContext* RenderViewHostTestHarness::browser_context() { |
MockRenderProcessHost* RenderViewHostTestHarness::process() { |
if (pending_rvh()) |
- return static_cast<MockRenderProcessHost*>(pending_rvh()->process()); |
- return static_cast<MockRenderProcessHost*>(rvh()->process()); |
+ return static_cast<MockRenderProcessHost*>(pending_rvh()->GetProcess()); |
+ return static_cast<MockRenderProcessHost*>(rvh()->GetProcess()); |
} |
void RenderViewHostTestHarness::DeleteContents() { |