Fix RenderFrameProxyHost::GetRenderViewHost for subframes.

content/browser/frame_host/render_frame_proxy_host.cc

Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 22d5bb75831c7035f283f9ccfdfbd50f6b2914ee..5cbad79015f58ca18e4fd008ab31a396e7e8da7e 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -53,9 +53,7 @@ void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
 }
 
 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
-  if (render_frame_host_.get())
-    return render_frame_host_->render_view_host();
-  return NULL;
+  return frame_tree_node_->frame_tree()->GetRenderViewHost(site_instance_);

[Charlie Reis, 2014/08/22 18:15:15]

This follows the pattern from InitRenderFrameProxy below.

It's still possible for it to return null if the frame tree doesn't have a RVH
for this SiteInstance (maybe a timing issue?), but this at least works for the
subframe case when render_frame_host_ is null.

[nasko, 2014/08/22 18:18:04]

The RVH should be created before any RFH/RFPH objects are created, so I think we
should be safe. If I'm wrong, we will be proven wrong fairly easily ;).
I also like that we are now consistent within the file.

 }
 
 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {