Define the public interface for content browser SiteInstance. This interface is implemented by th...

content/browser/tab_contents/tab_contents.cc

Index: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc	(revision 118703)
+++ content/browser/tab_contents/tab_contents.cc	(working copy)
@@ -27,7 +27,7 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_request_details.h"
-#include "content/browser/site_instance.h"
+#include "content/browser/site_instance_impl.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
@@ -199,7 +199,7 @@
 
 WebContents* WebContents::Create(
     BrowserContext* browser_context,
-    SiteInstance* site_instance,
+    content::SiteInstance* site_instance,
     int routing_id,
     const WebContents* base_tab_contents,
     SessionStorageNamespace* session_storage_namespace) {
@@ -214,7 +214,7 @@
 // TabContents ----------------------------------------------------------------
 
 TabContents::TabContents(content::BrowserContext* browser_context,
-                         SiteInstance* site_instance,
+                         content::SiteInstance* site_instance,
                          int routing_id,
                          const TabContents* base_tab_contents,
                          SessionStorageNamespace* session_storage_namespace)
@@ -503,32 +503,33 @@
   return GetMaxPageIDForSiteInstance(GetSiteInstance());
 }
 
-int32 TabContents::GetMaxPageIDForSiteInstance(SiteInstance* site_instance) {
-  if (max_page_ids_.find(site_instance->id()) == max_page_ids_.end())
-    max_page_ids_[site_instance->id()] = -1;
+int32 TabContents::GetMaxPageIDForSiteInstance(
+    content::SiteInstance* site_instance) {
+  if (max_page_ids_.find(site_instance->GetId()) == max_page_ids_.end())
+    max_page_ids_[site_instance->GetId()] = -1;
 
-  return max_page_ids_[site_instance->id()];
+  return max_page_ids_[site_instance->GetId()];
 }
 
 void TabContents::UpdateMaxPageID(int32 page_id) {
   UpdateMaxPageIDForSiteInstance(GetSiteInstance(), page_id);
 }
 
-void TabContents::UpdateMaxPageIDForSiteInstance(SiteInstance* site_instance,
-                                                 int32 page_id) {
+void TabContents::UpdateMaxPageIDForSiteInstance(
+    content::SiteInstance* site_instance, int32 page_id) {
   if (GetMaxPageIDForSiteInstance(site_instance) < page_id)
-    max_page_ids_[site_instance->id()] = page_id;
+    max_page_ids_[site_instance->GetId()] = page_id;
 }
 
 void TabContents::CopyMaxPageIDsFrom(TabContents* tab_contents) {
   max_page_ids_ = tab_contents->max_page_ids_;
 }
 
-SiteInstance* TabContents::GetSiteInstance() const {
+content::SiteInstance* TabContents::GetSiteInstance() const {
   return render_manager_.current_host()->site_instance();
 }
 
-SiteInstance* TabContents::GetPendingSiteInstance() const {
+content::SiteInstance* TabContents::GetPendingSiteInstance() const {
   RenderViewHost* dest_rvh = render_manager_.pending_render_view_host() ?
       render_manager_.pending_render_view_host() :
       render_manager_.current_host();
@@ -672,7 +673,7 @@
   // processes for some reason.
   TabContents* tc = new TabContents(
       GetBrowserContext(),
-      SiteInstance::CreateSiteInstance(GetBrowserContext()),
+      content::SiteInstance::CreateSiteInstance(GetBrowserContext()),
       MSG_ROUTING_NONE, this, NULL);
   tc->GetControllerImpl().CopyStateFrom(controller_);
   return tc;
@@ -878,9 +879,10 @@
   return true;
 }
 
-void TabContents::SetHistoryLengthAndPrune(const SiteInstance* site_instance,
-                                           int history_length,
-                                           int32 minimum_page_id) {
+void TabContents::SetHistoryLengthAndPrune(
+    const content::SiteInstance* site_instance,
+    int history_length,
+    int32 minimum_page_id) {
   // SetHistoryLengthAndPrune doesn't work when there are pending cross-site
   // navigations. Callers should ensure that this is the case.
   if (render_manager_.pending_render_view_host()) {
@@ -1739,7 +1741,7 @@
     render_manager_.DidNavigateMainFrame(rvh);
 
   // Update the site of the SiteInstance if it doesn't have one yet.
-  if (!GetSiteInstance()->has_site())
+  if (!GetSiteInstance()->HasSite())
     GetSiteInstance()->SetSite(params.url);
 
   // Need to update MIME type here because it's referred to in