Removal of Profile from content part 1.

content/browser/site_instance.cc

 // Copyright (c) 2011 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/site_instance.h"
 
 #include "content/browser/browsing_instance.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/webui/web_ui_factory.h"
@@ skipping 53 matching lines @@
   // with no site set at this point, so it will default to TYPE_NORMAL.  This
   // may not be correct, so we'll wind up potentially creating a process that
   // we then throw away, or worse sharing a process with the wrong process type.
   // See crbug.com/43448.
 
   // Create a new process if ours went away or was reused.
   if (!process_) {
     // See if we should reuse an old process
     if (RenderProcessHost::ShouldTryToUseExistingProcessHost())
       process_ = RenderProcessHost::GetExistingProcessHost(
-          browsing_instance_->profile(), GetRendererType());
+          browsing_instance_->browser_context(), GetRendererType());
 
     // Otherwise (or if that fails), create a new one.
     if (!process_) {
       if (render_process_host_factory_) {
         process_ = render_process_host_factory_->CreateRenderProcessHost(
-            browsing_instance_->profile());
+            browsing_instance_->browser_context());
       } else {
-        process_ = new BrowserRenderProcessHost(browsing_instance_->profile());
+        process_ =
+            new BrowserRenderProcessHost(browsing_instance_->browser_context());
       }
     }
 
     // Make sure the process starts at the right max_page_id
     process_->UpdateMaxPageID(max_page_id_);
   }
   DCHECK(process_);
 
   return process_;
 }
 
 void SiteInstance::SetSite(const GURL& url) {
   // A SiteInstance's site should not change.
   // TODO(creis): When following links or script navigations, we can currently
   // render pages from other sites in this SiteInstance.  This will eventually
   // be fixed, but until then, we should still not set the site of a
   // SiteInstance more than once.
   DCHECK(!has_site_);
 
   // Remember that this SiteInstance has been used to load a URL, even if the
   // URL is invalid.
   has_site_ = true;
-  site_ = GetSiteForURL(browsing_instance_->profile(), url);
+  site_ = GetSiteForURL(browsing_instance_->browser_context(), url);
 
   // Now that we have a site, register it with the BrowsingInstance.  This
   // ensures that we won't create another SiteInstance for this site within
   // the same BrowsingInstance, because all same-site pages within a
   // BrowsingInstance can script each other.
   browsing_instance_->RegisterSiteInstance(this);
 }
 
 bool SiteInstance::HasRelatedSiteInstance(const GURL& url) {
   return browsing_instance_->HasSiteInstance(url);
 }
 
 SiteInstance* SiteInstance::GetRelatedSiteInstance(const GURL& url) {
   return browsing_instance_->GetSiteInstanceForURL(url);
 }
 
 bool SiteInstance::HasWrongProcessForURL(const GURL& url) const {
   // Having no process isn't a problem, since we'll assign it correctly.
   if (!HasProcess())
     return false;
 
   // If the effective URL is an extension (e.g., for hosted apps) but the
   // process is not (or vice versa), make sure we notice and fix it.
-  GURL effective_url = GetEffectiveURL(browsing_instance_->profile(), url);
+  GURL effective_url = GetEffectiveURL(browsing_instance_->browser_context(),
+                                       url);
   return effective_url.SchemeIs(chrome::kExtensionScheme) !=
       process_->is_extension_process();
 }
 
 /*static*/
-SiteInstance* SiteInstance::CreateSiteInstance(Profile* profile) {
-  return new SiteInstance(new BrowsingInstance(profile));
+SiteInstance* SiteInstance::CreateSiteInstance(
+    content::BrowserContext* browser_context) {
+  return new SiteInstance(new BrowsingInstance(browser_context));
 }
 
 /*static*/
-SiteInstance* SiteInstance::CreateSiteInstanceForURL(Profile* profile,
-                                                     const GURL& url) {
+SiteInstance* SiteInstance::CreateSiteInstanceForURL(
+    content::BrowserContext* browser_context, const GURL& url) {
   // This BrowsingInstance may be deleted if it returns an existing
   // SiteInstance.
-  scoped_refptr<BrowsingInstance> instance(new BrowsingInstance(profile));
+  scoped_refptr<BrowsingInstance> instance(
+      new BrowsingInstance(browser_context));
   return instance->GetSiteInstanceForURL(url);
 }
 
 /*static*/
-GURL SiteInstance::GetSiteForURL(Profile* profile, const GURL& real_url) {
-  GURL url = GetEffectiveURL(profile, real_url);
+GURL SiteInstance::GetSiteForURL(content::BrowserContext* browser_context,
+                                 const GURL& real_url) {
+  GURL url = GetEffectiveURL(browser_context, real_url);
 
   // URLs with no host should have an empty site.
   GURL site;
 
   // TODO(creis): For many protocols, we should just treat the scheme as the
   // site, since there is no host.  e.g., file:, about:, chrome:
 
   // If the url has a host, then determine the site.
   if (url.has_host()) {
     // Only keep the scheme and registered domain as given by GetOrigin.  This
@@ skipping 13 matching lines @@
     if (!domain.empty()) {
       GURL::Replacements rep;
       rep.SetHostStr(domain);
       site = site.ReplaceComponents(rep);
     }
   }
   return site;
 }
 
 /*static*/
-bool SiteInstance::IsSameWebSite(Profile* profile,
+bool SiteInstance::IsSameWebSite(content::BrowserContext* browser_context,
                                  const GURL& real_url1, const GURL& real_url2) {
-  GURL url1 = GetEffectiveURL(profile, real_url1);
-  GURL url2 = GetEffectiveURL(profile, real_url2);
+  GURL url1 = GetEffectiveURL(browser_context, real_url1);
+  GURL url2 = GetEffectiveURL(browser_context, real_url2);
 
   // We infer web site boundaries based on the registered domain name of the
   // top-level page and the scheme.  We do not pay attention to the port if
   // one is present, because pages served from different ports can still
   // access each other if they change their document.domain variable.
 
   // Some special URLs will match the site instance of any other URL. This is
   // done before checking both of them for validity, since we want these URLs
   // to have the same site instance as even an invalid one.
   if (IsURLSameAsAnySiteInstance(url1) || IsURLSameAsAnySiteInstance(url2))
     return true;
 
   // If either URL is invalid, they aren't part of the same site.
   if (!url1.is_valid() || !url2.is_valid())
     return false;
 
   // If the schemes differ, they aren't part of the same site.
   if (url1.scheme() != url2.scheme())
     return false;
 
   return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
 }
 
 /*static*/
-GURL SiteInstance::GetEffectiveURL(Profile* profile, const GURL& url) {
-  return content::GetContentClient()->browser()->GetEffectiveURL(profile, url);
+GURL SiteInstance::GetEffectiveURL(content::BrowserContext* browser_context,
+                                   const GURL& url) {
+  return content::GetContentClient()->browser()->
+      GetEffectiveURL(browser_context, url);
 }
 
 /*static*/
 RenderProcessHost::Type SiteInstance::RendererTypeForURL(const GURL& url) {
   if (!url.is_valid())
     return RenderProcessHost::TYPE_NORMAL;
 
   if (url.SchemeIs(chrome::kExtensionScheme))
     return RenderProcessHost::TYPE_EXTENSION;
 
@@ skipping 14 matching lines @@
 }
 
 void SiteInstance::Observe(int type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
   RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
   if (rph == process_)
     process_ = NULL;
 }