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

content/browser/tab_contents/navigation_controller_impl.cc

Index: content/browser/tab_contents/navigation_controller_impl.cc
===================================================================
--- content/browser/tab_contents/navigation_controller_impl.cc	(revision 118703)
+++ content/browser/tab_contents/navigation_controller_impl.cc	(working copy)
@@ -14,7 +14,7 @@
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/renderer_host/render_view_host.h"  // Temporary
-#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/tab_contents.h"
@@ -291,7 +291,8 @@
 }
 
 NavigationEntryImpl* NavigationControllerImpl::GetEntryWithPageID(
-    SiteInstance* instance, int32 page_id) const {
+  content::SiteInstance* instance,
+  int32 page_id) const {
   int index = GetEntryIndexWithPageID(instance, page_id);
   return (index != -1) ? entries_[index].get() : NULL;
 }
@@ -724,7 +725,7 @@
       temp.append(base::IntToString(entries_[i]->GetPageID()));
       temp.append("_");
       if (entries_[i]->site_instance())
-        temp.append(base::IntToString(entries_[i]->site_instance()->id()));
+        temp.append(base::IntToString(entries_[i]->site_instance()->GetId()));
       else
         temp.append("N");
       if (entries_[i]->site_instance() != tab_contents_->GetSiteInstance())
@@ -1007,7 +1008,7 @@
   // can't be freed during this time period.
   NavigationEntryImpl* last_committed =
       NavigationEntryImpl::FromNavigationEntry(GetLastCommittedEntry());
-  scoped_refptr<SiteInstance> site_instance(
+  scoped_refptr<content::SiteInstance> site_instance(
       last_committed ? last_committed->site_instance() : NULL);
   int32 minimum_page_id = last_committed ? last_committed->GetPageID() : -1;
   int32 max_page_id = last_committed ?
@@ -1338,7 +1339,7 @@
 }
 
 int NavigationControllerImpl::GetEntryIndexWithPageID(
-    SiteInstance* instance, int32 page_id) const {
+    content::SiteInstance* instance, int32 page_id) const {
   for (int i = static_cast<int>(entries_.size()) - 1; i >= 0; --i) {
     if ((entries_[i]->site_instance() == instance) &&
         (entries_[i]->GetPageID() == page_id))