| 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 5cbad79015f58ca18e4fd008ab31a396e7e8da7e..e6032f2fd73d84951de26e3f933a9cdd83da41a5 100644
|
| --- a/content/browser/frame_host/render_frame_proxy_host.cc
|
| +++ b/content/browser/frame_host/render_frame_proxy_host.cc
|
| @@ -53,7 +53,8 @@ void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
|
| }
|
|
|
| RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
|
| - return frame_tree_node_->frame_tree()->GetRenderViewHost(site_instance_);
|
| + return frame_tree_node_->frame_tree()->GetRenderViewHost(
|
| + site_instance_.get());
|
| }
|
|
|
| scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
|
| @@ -94,16 +95,17 @@ bool RenderFrameProxyHost::InitRenderFrameProxy() {
|
|
|
| int parent_routing_id = MSG_ROUTING_NONE;
|
| if (frame_tree_node_->parent()) {
|
| - parent_routing_id = frame_tree_node_->parent()->render_manager()->
|
| - GetRoutingIdForSiteInstance(site_instance_);
|
| + parent_routing_id = frame_tree_node_->parent()
|
| + ->render_manager()
|
| + ->GetRoutingIdForSiteInstance(site_instance_.get());
|
| CHECK_NE(parent_routing_id, MSG_ROUTING_NONE);
|
| }
|
|
|
| - Send(new FrameMsg_NewFrameProxy(
|
| - routing_id_,
|
| - parent_routing_id,
|
| - frame_tree_node_->frame_tree()->GetRenderViewHost(
|
| - site_instance_)->GetRoutingID()));
|
| + Send(new FrameMsg_NewFrameProxy(routing_id_,
|
| + parent_routing_id,
|
| + frame_tree_node_->frame_tree()
|
| + ->GetRenderViewHost(site_instance_.get())
|
| + ->GetRoutingID()));
|
|
|
| return true;
|
| }
|
|
|