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

content/browser/browsing_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "content/browser/site_instance.h"
+#include "content/browser/site_instance_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_ui_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 
 // static
 base::LazyInstance<
     BrowsingInstance::ContextSiteInstanceMap,
     base::LeakyLazyInstanceTraits<BrowsingInstance::ContextSiteInstanceMap> >
@@ skipping 29 matching lines @@
       !url.SchemeIs(chrome::kChromeDevToolsScheme)) {
     return true;
   }
 
   // In all other cases, don't use process-per-site logic.
   return false;
 }
 
 BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
     content::BrowserContext* browser_context, const GURL& url) {
-  if (!ShouldUseProcessPerSite(SiteInstance::GetEffectiveURL(browser_context,
-                                                             url))) {
+  if (!ShouldUseProcessPerSite(
+      content::SiteInstance::GetEffectiveURL(browser_context, url))) {
     // Not using process-per-site, so use a map specific to this instance.
     return &site_instance_map_;
   }
 
   // Otherwise, process-per-site is in use, at least for this URL.  Look up the
   // global map for this context, creating an entry if necessary.
   return &context_site_instance_map_.Get()[browser_context];
 }
 
 bool BrowsingInstance::HasSiteInstance(const GURL& url) {
   std::string site =
-      SiteInstance::GetSiteForURL(browser_context_, url)
+      content::SiteInstance::GetSiteForURL(browser_context_, url)
           .possibly_invalid_spec();
 
   SiteInstanceMap* map = GetSiteInstanceMap(browser_context_, url);
   SiteInstanceMap::iterator i = map->find(site);
   return (i != map->end());
 }
 
-SiteInstance* BrowsingInstance::GetSiteInstanceForURL(const GURL& url) {
+content::SiteInstance* BrowsingInstance::GetSiteInstanceForURL(

[jam, 2012/01/24 03:29:33]

nit: use "using content::SiteInstance" above. all the code in content will
eventually move to the content namespace, so doing this now saves more work in
the future. also in other content files

[ananta, 2012/01/24 23:46:26]

Done.

+    const GURL& url) {
   std::string site =
-      SiteInstance::GetSiteForURL(browser_context_, url)
+      content::SiteInstance::GetSiteForURL(browser_context_, url)
           .possibly_invalid_spec();
 
   SiteInstanceMap* map = GetSiteInstanceMap(browser_context_, url);
   SiteInstanceMap::iterator i = map->find(site);
   if (i != map->end()) {
     return i->second;
   }
 
   // No current SiteInstance for this site, so let's create one.
-  SiteInstance* instance = new SiteInstance(this);
+  SiteInstanceImpl* instance = new SiteInstanceImpl(this);
 
   // Set the site of this new SiteInstance, which will register it with us.
   instance->SetSite(url);
   return instance;
 }
 
-void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) {
-  DCHECK(site_instance->browsing_instance_ == this);
-  DCHECK(site_instance->has_site());
-  std::string site = site_instance->site().possibly_invalid_spec();
+void BrowsingInstance::RegisterSiteInstance(
+    content::SiteInstance* site_instance) {
+  DCHECK(site_instance->GetBrowsingInstance() == this);
+  DCHECK(site_instance->HasSite());
+  std::string site = site_instance->GetSite().possibly_invalid_spec();
 
   // Only register if we don't have a SiteInstance for this site already.
   // It's possible to have two SiteInstances point to the same site if two
   // tabs are navigated there at the same time.  (We don't call SetSite or
   // register them until DidNavigate.)  If there is a previously existing
   // SiteInstance for this site, we just won't register the new one.
   SiteInstanceMap* map = GetSiteInstanceMap(browser_context_,
-                                            site_instance->site());
+                                            site_instance->GetSite());
   SiteInstanceMap::iterator i = map->find(site);
   if (i == map->end()) {
     // Not previously registered, so register it.
     (*map)[site] = site_instance;
   }
 }
 
-void BrowsingInstance::UnregisterSiteInstance(SiteInstance* site_instance) {
-  DCHECK(site_instance->browsing_instance_ == this);
-  DCHECK(site_instance->has_site());
-  std::string site = site_instance->site().possibly_invalid_spec();
+void BrowsingInstance::UnregisterSiteInstance(
+    content::SiteInstance* site_instance) {
+      DCHECK(site_instance->GetBrowsingInstance() == this);
+  DCHECK(site_instance->HasSite());
+  std::string site = site_instance->GetSite().possibly_invalid_spec();
 
   // Only unregister the SiteInstance if it is the same one that is registered
   // for the site.  (It might have been an unregistered SiteInstance.  See the
   // comments in RegisterSiteInstance.)
 
   // We look for the site instance in both the local site_instance_map_ and also
   // the static context_site_instance_map_ - this is because the logic in
   // ShouldUseProcessPerSite() can produce different results over the lifetime
   // of Chrome (e.g. installation of apps with web extents can change our
   // process-per-site policy for a given domain), so we don't know which map
   // the site was put into when it was originally registered.
   if (!RemoveSiteInstanceFromMap(&site_instance_map_, site, site_instance)) {
     // Wasn't in our local map, so look in the static per-browser context map.
     RemoveSiteInstanceFromMap(
         &context_site_instance_map_.Get()[browser_context_],
         site,
         site_instance);
   }
 }
 
-bool BrowsingInstance::RemoveSiteInstanceFromMap(SiteInstanceMap* map,
-                                                 const std::string& site,
-                                                 SiteInstance* site_instance) {
+bool BrowsingInstance::RemoveSiteInstanceFromMap(
+    SiteInstanceMap* map,
+    const std::string& site,
+    content::SiteInstance* site_instance) {
   SiteInstanceMap::iterator i = map->find(site);
   if (i != map->end() && i->second == site_instance) {
     // Matches, so erase it.
     map->erase(i);
     return true;
   }
   return false;
 }
 
 BrowsingInstance::~BrowsingInstance() {
   // We should only be deleted when all of the SiteInstances that refer to
   // us are gone.
   DCHECK(site_instance_map_.empty());
 }