Inside of content, prefer SiteInstanceImpl to SiteInstance.

content/browser/frame_host/frame_tree.cc

Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 388c878ba3b06a3a6fd0bb69386ca6fdadf7e09d..1c563d36b246899e136d8c9511f3fd8829d26e93 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -31,8 +31,8 @@ namespace {
 // Helper function to collect SiteInstances involved in rendering a single
 // FrameTree (which is a subset of SiteInstances in main frame's proxy_hosts_
 // because of openers).
-std::set<SiteInstance*> CollectSiteInstances(FrameTree* tree) {
-  std::set<SiteInstance*> instances;
+std::set<SiteInstanceImpl*> CollectSiteInstances(FrameTree* tree) {
+  std::set<SiteInstanceImpl*> instances;
   for (FrameTreeNode* node : tree->Nodes())
     instances.insert(node->current_frame_host()->GetSiteInstance());
   return instances;
@@ -212,9 +212,8 @@ void FrameTree::RemoveFrame(FrameTreeNode* child) {
   parent->RemoveChild(child);
 }
 
-void FrameTree::CreateProxiesForSiteInstance(
-    FrameTreeNode* source,
-    SiteInstance* site_instance) {
+void FrameTree::CreateProxiesForSiteInstance(FrameTreeNode* source,
+                                             SiteInstanceImpl* site_instance) {
   // Create the RenderFrameProxyHost for the new SiteInstance.
   if (!source || !source->IsMainFrame()) {
     RenderViewHostImpl* render_view_host = GetRenderViewHost(site_instance);
@@ -232,7 +231,7 @@ void FrameTree::CreateProxiesForSiteInstance(
   for (FrameTreeNode* node : NodesExcept(source)) {
     // If a new frame is created in the current SiteInstance, other frames in
     // that SiteInstance don't need a proxy for the new frame.
-    SiteInstance* current_instance =
+    SiteInstanceImpl* current_instance =
         node->render_manager()->current_frame_host()->GetSiteInstance();
     if (current_instance != site_instance)
       node->render_manager()->CreateRenderFrameProxy(site_instance);
@@ -247,14 +246,14 @@ FrameTreeNode* FrameTree::GetFocusedFrame() {
   return FindByID(focused_frame_tree_node_id_);
 }
 
-void FrameTree::SetFocusedFrame(FrameTreeNode* node, SiteInstance* source) {
+void FrameTree::SetFocusedFrame(FrameTreeNode* node, SiteInstanceImpl* source) {
   if (node == GetFocusedFrame())
     return;
 
-  std::set<SiteInstance*> frame_tree_site_instances =
+  std::set<SiteInstanceImpl*> frame_tree_site_instances =
       CollectSiteInstances(this);
 
-  SiteInstance* current_instance =
+  SiteInstanceImpl* current_instance =
       node->current_frame_host()->GetSiteInstance();
 
   // Update the focused frame in all other SiteInstances.  If focus changes to
@@ -296,7 +295,7 @@ void FrameTree::SetFrameRemoveListener(
 }
 
 RenderViewHostImpl* FrameTree::CreateRenderViewHost(
-    SiteInstance* site_instance,
+    SiteInstanceImpl* site_instance,
     int32_t routing_id,
     int32_t main_frame_routing_id,
     bool swapped_out,
@@ -327,7 +326,8 @@ RenderViewHostImpl* FrameTree::CreateRenderViewHost(
   return rvh;
 }
 
-RenderViewHostImpl* FrameTree::GetRenderViewHost(SiteInstance* site_instance) {
+RenderViewHostImpl* FrameTree::GetRenderViewHost(
+    SiteInstanceImpl* site_instance) {
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
   // Don't return the RVH if it is pending deletion.
@@ -339,7 +339,7 @@ RenderViewHostImpl* FrameTree::GetRenderViewHost(SiteInstance* site_instance) {
 }
 
 void FrameTree::AddRenderViewHostRef(RenderViewHostImpl* render_view_host) {
-  SiteInstance* site_instance = render_view_host->GetSiteInstance();
+  SiteInstanceImpl* site_instance = render_view_host->GetSiteInstance();
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
   CHECK(iter != render_view_host_map_.end());
@@ -349,7 +349,7 @@ void FrameTree::AddRenderViewHostRef(RenderViewHostImpl* render_view_host) {
 }
 
 void FrameTree::ReleaseRenderViewHostRef(RenderViewHostImpl* render_view_host) {
-  SiteInstance* site_instance = render_view_host->GetSiteInstance();
+  SiteInstanceImpl* site_instance = render_view_host->GetSiteInstance();
   int32_t site_instance_id = site_instance->GetId();
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance_id);
@@ -444,7 +444,7 @@ bool FrameTree::IsLoading() const {
 }
 
 void FrameTree::ReplicatePageFocus(bool is_focused) {
-  std::set<SiteInstance*> frame_tree_site_instances =
+  std::set<SiteInstanceImpl*> frame_tree_site_instances =
       CollectSiteInstances(this);
 
   // Send the focus update to main frame's proxies in all SiteInstances of
@@ -456,7 +456,7 @@ void FrameTree::ReplicatePageFocus(bool is_focused) {
     SetPageFocus(instance, is_focused);
 }
 
-void FrameTree::SetPageFocus(SiteInstance* instance, bool is_focused) {
+void FrameTree::SetPageFocus(SiteInstanceImpl* instance, bool is_focused) {
   RenderFrameHostManager* root_manager = root_->render_manager();
 
   // This is only used to set page-level focus in cross-process subframes, and