Inside of content, prefer SiteInstanceImpl to SiteInstance.

content/browser/frame_host/render_frame_host_manager.h

Index: content/browser/frame_host/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 59434d00e7cfce00c8634a0aa813641347eac4aa..b66fb9d80eb04efde37d4919800bd2521a5cf937 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -194,7 +194,7 @@ class CONTENT_EXPORT RenderFrameHostManager
   ~RenderFrameHostManager();
 
   // For arguments, see WebContentsImpl constructor.
-  void Init(SiteInstance* site_instance,
+  void Init(SiteInstanceImpl* site_instance,
             int32_t view_routing_id,
             int32_t frame_routing_id,
             int32_t widget_routing_id);
@@ -333,18 +333,18 @@ class CONTENT_EXPORT RenderFrameHostManager
   // updated opener will be forwarded to any other RenderFrameProxies and
   // RenderFrames for this FrameTreeNode.
   void DidChangeOpener(int opener_routing_id,
-                       SiteInstance* source_site_instance);
+                       SiteInstanceImpl* source_site_instance);
 
   // Creates and initializes a RenderFrameHost. If |view_routing_id_ptr|
   // is not nullptr it will be set to the routing id of the view associated with
   // the frame.
-  scoped_ptr<RenderFrameHostImpl> CreateRenderFrame(SiteInstance* instance,
+  scoped_ptr<RenderFrameHostImpl> CreateRenderFrame(SiteInstanceImpl* instance,
                                                     bool hidden,
                                                     int* view_routing_id_ptr);
 
   // Helper method to create and initialize a RenderFrameProxyHost and return
   // its routing id.
-  int CreateRenderFrameProxy(SiteInstance* instance);
+  int CreateRenderFrameProxy(SiteInstanceImpl* instance);
 
   // Creates proxies for a new child frame at FrameTreeNode |child| in all
   // SiteInstances for which the current frame has proxies.  This method is
@@ -405,7 +405,7 @@ class CONTENT_EXPORT RenderFrameHostManager
   // Returns the routing id for a RenderFrameHost or RenderFrameProxyHost
   // that has the given SiteInstance and is associated with this
   // RenderFrameHostManager. Returns MSG_ROUTING_NONE if none is found.
-  int GetRoutingIdForSiteInstance(SiteInstance* site_instance);
+  int GetRoutingIdForSiteInstance(SiteInstanceImpl* site_instance);
 
   // PlzNavigate
   // Notifies the RenderFrameHostManager that a new NavigationRequest has been
@@ -450,7 +450,7 @@ class CONTENT_EXPORT RenderFrameHostManager
                          bool is_potentially_trustworthy_unique_origin);
 
   void EnsureRenderViewInitialized(RenderViewHostImpl* render_view_host,
-                                   SiteInstance* instance);
+                                   SiteInstanceImpl* instance);
 
   // Creates swapped out RenderViews and RenderFrameProxies for this frame's
   // FrameTree and for its opener chain in the given SiteInstance. This allows
@@ -460,7 +460,7 @@ class CONTENT_EXPORT RenderFrameHostManager
   // subtree rooted at |skip_this_node| (e.g., if a node is being navigated, it
   // can be passed here to prevent proxies from being created for it, in
   // case it is in the same FrameTree as another node on its opener chain).
-  void CreateOpenerProxies(SiteInstance* instance,
+  void CreateOpenerProxies(SiteInstanceImpl* instance,
                            FrameTreeNode* skip_this_node);
 
   // Ensure that this frame has proxies in all SiteInstances that can discover
@@ -473,14 +473,14 @@ class CONTENT_EXPORT RenderFrameHostManager
   // (if opener's current or pending RFH has SiteInstance |instance|) or a
   // RenderFrameProxyHost.  Returns MSG_ROUTING_NONE if there is no opener, or
   // if the opener node doesn't have a proxy for |instance|.
-  int GetOpenerRoutingID(SiteInstance* instance);
+  int GetOpenerRoutingID(SiteInstanceImpl* instance);
 
   // Called on the RFHM of the inner WebContents to create a
   // RenderFrameProxyHost in its outer WebContents's SiteInstance,
   // |outer_contents_site_instance|. The frame in outer WebContents that is
   // hosting the inner WebContents is |render_frame_host|, and the frame will
   // be swapped out with the proxy.
-  void CreateOuterDelegateProxy(SiteInstance* outer_contents_site_instance,
+  void CreateOuterDelegateProxy(SiteInstanceImpl* outer_contents_site_instance,
                                 RenderFrameHostImpl* render_frame_host);
 
   // Sets the child RenderWidgetHostView for this frame, which must be part of
@@ -531,7 +531,7 @@ class CONTENT_EXPORT RenderFrameHostManager
   // can point to an existing one or store the details needed to create a new
   // one.
   struct CONTENT_EXPORT SiteInstanceDescriptor {
-    explicit SiteInstanceDescriptor(content::SiteInstance* site_instance)
+    explicit SiteInstanceDescriptor(content::SiteInstanceImpl* site_instance)
         : existing_site_instance(site_instance),
           relation(SiteInstanceRelation::UNRELATED) {}
 
@@ -540,7 +540,7 @@ class CONTENT_EXPORT RenderFrameHostManager
                            SiteInstanceRelation relation_to_current);
 
     // Set with an existing SiteInstance to be reused.
-    content::SiteInstance* existing_site_instance;
+    content::SiteInstanceImpl* existing_site_instance;
 
     // In case |existing_site_instance| is null, specify a new site URL.
     GURL new_site_url;
@@ -551,10 +551,11 @@ class CONTENT_EXPORT RenderFrameHostManager
   };
 
   // Create a RenderFrameProxyHost owned by this object.
-  RenderFrameProxyHost* CreateRenderFrameProxyHost(SiteInstance* site_instance,
-                                                   RenderViewHostImpl* rvh);
+  RenderFrameProxyHost* CreateRenderFrameProxyHost(
+      SiteInstanceImpl* site_instance,
+      RenderViewHostImpl* rvh);
   // Delete a RenderFrameProxyHost owned by this object.
-  void DeleteRenderFrameProxyHost(SiteInstance* site_instance);
+  void DeleteRenderFrameProxyHost(SiteInstanceImpl* site_instance);
 
   // Returns whether this tab should transition to a new renderer for
   // cross-site URLs.  Enabled unless we see the --process-per-tab command line
@@ -577,16 +578,16 @@ class CONTENT_EXPORT RenderFrameHostManager
   bool ShouldSwapBrowsingInstancesForNavigation(
       const GURL& current_effective_url,
       bool current_is_view_source_mode,
-      SiteInstance* new_site_instance,
+      SiteInstanceImpl* new_site_instance,
       const GURL& new_effective_url,
       bool new_is_view_source_mode) const;
 
   // Returns the SiteInstance to use for the navigation.
-  scoped_refptr<SiteInstance> GetSiteInstanceForNavigation(
+  scoped_refptr<SiteInstanceImpl> GetSiteInstanceForNavigation(
       const GURL& dest_url,
-      SiteInstance* source_instance,
-      SiteInstance* dest_instance,
-      SiteInstance* candidate_instance,
+      SiteInstanceImpl* source_instance,
+      SiteInstanceImpl* dest_instance,
+      SiteInstanceImpl* candidate_instance,
       ui::PageTransition transition,
       bool dest_is_restore,
       bool dest_is_view_source_mode);
@@ -607,9 +608,9 @@ class CONTENT_EXPORT RenderFrameHostManager
   // This is a helper function for GetSiteInstanceForNavigation.
   SiteInstanceDescriptor DetermineSiteInstanceForURL(
       const GURL& dest_url,
-      SiteInstance* source_instance,
-      SiteInstance* current_instance,
-      SiteInstance* dest_instance,
+      SiteInstanceImpl* source_instance,
+      SiteInstanceImpl* current_instance,
+      SiteInstanceImpl* dest_instance,
       ui::PageTransition transition,
       bool dest_is_restore,
       bool dest_is_view_source_mode,
@@ -618,9 +619,9 @@ class CONTENT_EXPORT RenderFrameHostManager
   // Converts a SiteInstanceDescriptor to the actual SiteInstance it describes.
   // If a |candidate_instance| is provided (is not nullptr) and it matches the
   // description, it is returned as is.
-  scoped_refptr<SiteInstance> ConvertToSiteInstance(
+  scoped_refptr<SiteInstanceImpl> ConvertToSiteInstance(
       const SiteInstanceDescriptor& descriptor,
-      SiteInstance* candidate_instance);
+      SiteInstanceImpl* candidate_instance);
 
   // Returns true if |candidate| is currently on the same web site as dest_url.
   bool IsCurrentlySameSite(RenderFrameHostImpl* candidate,
@@ -629,15 +630,15 @@ class CONTENT_EXPORT RenderFrameHostManager
   // Creates a new RenderFrameHostImpl for the |new_instance| and assign it to
   // |pending_render_frame_host_| while respecting the opener route if needed
   // and stores it in pending_render_frame_host_.
-  void CreatePendingRenderFrameHost(SiteInstance* old_instance,
-                                    SiteInstance* new_instance);
+  void CreatePendingRenderFrameHost(SiteInstanceImpl* old_instance,
+                                    SiteInstanceImpl* new_instance);
 
   // Ensure that we have created all needed proxies for a new RFH with
   // SiteInstance |new_instance|: (1) create swapped-out RVHs and proxies for
   // the new RFH's opener chain if we are staying in the same BrowsingInstance;
   // (2) Create proxies for the new RFH's SiteInstance in its own frame tree.
-  void CreateProxiesForNewRenderFrameHost(SiteInstance* old_instance,
-                                          SiteInstance* new_instance);
+  void CreateProxiesForNewRenderFrameHost(SiteInstanceImpl* old_instance,
+                                          SiteInstanceImpl* new_instance);
 
   // Traverse the opener chain and populate |opener_frame_trees| with
   // all FrameTrees accessible by following frame openers of nodes in the
@@ -656,12 +657,12 @@ class CONTENT_EXPORT RenderFrameHostManager
   // in CreateOpenerProxies for creating proxies in each FrameTree on the
   // opener chain.  Don't create proxies for the subtree rooted at
   // |skip_this_node|.
-  void CreateOpenerProxiesForFrameTree(SiteInstance* instance,
+  void CreateOpenerProxiesForFrameTree(SiteInstanceImpl* instance,
                                        FrameTreeNode* skip_this_node);
 
   // Creates a RenderFrameHost and corresponding RenderViewHost if necessary.
   scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(
-      SiteInstance* instance,
+      SiteInstanceImpl* instance,
       int32_t view_routing_id,
       int32_t frame_routing_id,
       int32_t widget_routing_id,
@@ -671,8 +672,8 @@ class CONTENT_EXPORT RenderFrameHostManager
   // Create and initialize a speculative RenderFrameHost for an ongoing
   // navigation. It might be destroyed and re-created later if the navigation
   // is redirected to a different SiteInstance.
-  bool CreateSpeculativeRenderFrameHost(SiteInstance* old_instance,
-                                        SiteInstance* new_instance);
+  bool CreateSpeculativeRenderFrameHost(SiteInstanceImpl* old_instance,
+                                        SiteInstanceImpl* new_instance);
 
   // Initialization for RenderFrameHost uses the same sequence as InitRenderView
   // above.
@@ -724,8 +725,8 @@ class CONTENT_EXPORT RenderFrameHostManager
 
   RenderFrameHostImpl* UpdateStateForNavigate(
       const GURL& dest_url,
-      SiteInstance* source_instance,
-      SiteInstance* dest_instance,
+      SiteInstanceImpl* source_instance,
+      SiteInstanceImpl* dest_instance,
       ui::PageTransition transition,
       bool dest_is_restore,
       bool dest_is_view_source_mode,