Remove indirection for SiteInstance and RenderProcessHost from RenderFrameHost.

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 109 matching lines @@
 
 RenderFrameHostImpl::RenderFrameHostImpl(RenderViewHostImpl* render_view_host,
                                          RenderFrameHostDelegate* delegate,
                                          RenderWidgetHostDelegate* rwh_delegate,
                                          FrameTree* frame_tree,
                                          FrameTreeNode* frame_tree_node,
                                          int routing_id,
                                          int flags)
     : render_view_host_(render_view_host),
       delegate_(delegate),
+      site_instance_(
+          static_cast<SiteInstanceImpl*>(render_view_host->GetSiteInstance())),

[Charlie Reis, 2015/01/27 02:09:04]

Let's pass the SiteInstance as a parameter rather than grabbing it from the RVH.

[nasko, 2015/01/27 22:30:34]

Done.

+      process_(render_view_host->GetSiteInstance()->GetProcess()),
       cross_process_frame_connector_(NULL),
       render_frame_proxy_host_(NULL),
       frame_tree_(frame_tree),
       frame_tree_node_(frame_tree_node),
       routing_id_(routing_id),
       render_frame_created_(false),
       navigations_suspended_(false),
       is_waiting_for_beforeunload_ack_(false),
       unload_ack_is_for_cross_site_transition_(false),
       accessibility_reset_token_(0),
@@ skipping 51 matching lines @@
 
   if (render_widget_host_)
     render_widget_host_->Cleanup();
 }
 
 int RenderFrameHostImpl::GetRoutingID() {
   return routing_id_;
 }
 
 SiteInstanceImpl* RenderFrameHostImpl::GetSiteInstance() {
-  return render_view_host_->GetSiteInstance();
+  return site_instance_.get();
 }
 
 RenderProcessHost* RenderFrameHostImpl::GetProcess() {
-  // TODO(nasko): This should return its own process, once we have working
-  // cross-process navigation for subframes.
-  return render_view_host_->GetProcess();
+  return process_;
 }
 
 RenderFrameHost* RenderFrameHostImpl::GetParent() {
   FrameTreeNode* parent_node = frame_tree_node_->parent();
   if (!parent_node)
     return NULL;
   return parent_node->current_frame_host();
 }
 
 const std::string& RenderFrameHostImpl::GetFrameName() {
@@ skipping 1517 matching lines @@
 void RenderFrameHostImpl::DidUseGeolocationPermission() {
   RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
   GetContentClient()->browser()->RegisterPermissionUsage(
       PERMISSION_GEOLOCATION,
       delegate_->GetAsWebContents(),
       GetLastCommittedURL().GetOrigin(),
       top_frame->GetLastCommittedURL().GetOrigin());
 }
 
 }  // namespace content