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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc	(revision 118703)
+++ chrome/browser/chrome_content_browser_client.cc	(working copy)
@@ -73,12 +73,12 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/resource_context.h"
-#include "content/browser/site_instance.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
@@ -323,7 +323,7 @@
 void ChromeContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
 
-  SiteInstance* site_instance = render_view_host->site_instance();
+  content::SiteInstance* site_instance = render_view_host->site_instance();
   Profile* profile = Profile::FromBrowserContext(
       site_instance->GetBrowserContext());
 
@@ -483,7 +483,7 @@
 }
 
 void ChromeContentBrowserClient::SiteInstanceGotProcess(
-    SiteInstance* site_instance) {
+    content::SiteInstance* site_instance) {
   CHECK(site_instance->HasProcess());
 
   Profile* profile = Profile::FromBrowserContext(
@@ -494,24 +494,24 @@
 
   const Extension* extension =
       service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(
-          site_instance->site()));
+          site_instance->GetSite()));
   if (!extension)
     return;
 
   service->process_map()->Insert(extension->id(),
                                  site_instance->GetProcess()->GetID(),
-                                 site_instance->id());
+                                 site_instance->GetId());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::RegisterExtensionProcess,
                  profile->GetExtensionInfoMap(),
                  extension->id(),
                  site_instance->GetProcess()->GetID(),
-                 site_instance->id()));
+                 site_instance->GetId()));
 }
 
 void ChromeContentBrowserClient::SiteInstanceDeleting(
-    SiteInstance* site_instance) {
+    content::SiteInstance* site_instance) {
   if (!site_instance->HasProcess())
     return;
 
@@ -523,20 +523,20 @@
 
   const Extension* extension =
       service->extensions()->GetExtensionOrAppByURL(
-          ExtensionURLInfo(site_instance->site()));
+          ExtensionURLInfo(site_instance->GetSite()));
   if (!extension)
     return;
 
   service->process_map()->Remove(extension->id(),
                                  site_instance->GetProcess()->GetID(),
-                                 site_instance->id());
+                                 site_instance->GetId());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::UnregisterExtensionProcess,
                  profile->GetExtensionInfoMap(),
                  extension->id(),
                  site_instance->GetProcess()->GetID(),
-                 site_instance->id()));
+                 site_instance->GetId()));
 }
 
 bool ChromeContentBrowserClient::ShouldSwapProcessesForNavigation(
@@ -1357,7 +1357,7 @@
   ExtensionService* service = profile->GetExtensionService();
   if (service) {
     const Extension* extension = service->extensions()->GetByID(
-        rvh->site_instance()->site().host());
+        rvh->site_instance()->GetSite().host());
     extension_webkit_preferences::SetPreferences(
         extension, rvh->delegate()->GetRenderViewType(), &web_prefs);
   }