Removal of Profile from content part 1.

content/browser/site_instance.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_SITE_INSTANCE_H_
 #define CONTENT_BROWSER_RENDERER_HOST_SITE_INSTANCE_H_
 #pragma once
 
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/notification_observer.h"
@@ skipping 18 matching lines @@
 // BrowsingInstance.
 //
 // In process-per-site-instance (the current default process model),
 // SiteInstances are created (1) when the user manually creates a new tab
 // (which also creates a new BrowsingInstance), and (2) when the user navigates
 // across site boundaries (which uses the same BrowsingInstance).  If the user
 // navigates within a site, or opens links in new tabs within a site, the same
 // SiteInstance is used.
 //
 // In --process-per-site, we consolidate all SiteInstances for a given site,
-// throughout the entire profile.  This ensures that only one process will be
+// throughout the entire context.  This ensures that only one process will be
 // dedicated to each site.
 //
 // Each NavigationEntry for a TabContents points to the SiteInstance that
 // rendered it.  Each RenderViewHost also points to the SiteInstance that it is
 // associated with.  A SiteInstance keeps track of the number of these
 // references and deletes itself when the count goes to zero.  This means that
 // a SiteInstance is only live as long as it is accessible, either from new
 // tabs with no NavigationEntries or in NavigationEntries in the history.
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 62 matching lines @@
 
   // Factory method to create a new SiteInstance.  This will create a new
   // new BrowsingInstance, so it should only be used when creating a new tab
   // from scratch (or similar circumstances).  Callers should ensure that
   // this SiteInstance becomes ref counted, by storing it in a scoped_refptr.
   //
   // The render process host factory may be NULL. See SiteInstance constructor.
   //
   // TODO(creis): This may be an argument to build a pass_refptr<T> class, as
   // Darin suggests.
-  static SiteInstance* CreateSiteInstance(Profile* profile);
+  static SiteInstance* CreateSiteInstance(content::BrowserContext* context);

[jam, 2011/07/22 16:58:38]

browser_context in all this file

 
   // Factory method to get the appropriate SiteInstance for the given URL, in
   // a new BrowsingInstance.  Use this instead of CreateSiteInstance when you
   // know the URL, since it allows special site grouping rules to be applied
   // (for example, to group chrome-ui pages into the same instance).
-  static SiteInstance* CreateSiteInstanceForURL(Profile* profile,
-                                                const GURL& url);
+  static SiteInstance* CreateSiteInstanceForURL(
+      content::BrowserContext* context, const GURL& url);
 
   // Returns the site for the given URL, which includes only the scheme and
   // registered domain.  Returns an empty GURL if the URL has no host.
-  static GURL GetSiteForURL(Profile* profile, const GURL& url);
+  static GURL GetSiteForURL(content::BrowserContext* context, const GURL& url);
 
   // Return whether both URLs are part of the same web site, for the purpose of
   // assigning them to processes accordingly.  The decision is currently based
   // on the registered domain of the URLs (google.com, bbc.co.uk), as well as
   // the scheme (https, http).  This ensures that two pages will be in
   // the same process if they can communicate with other via JavaScript.
   // (e.g., docs.google.com and mail.google.com have DOM access to each other
   // if they both set their document.domain properties to google.com.)
-  static bool IsSameWebSite(Profile* profile,
+  static bool IsSameWebSite(content::BrowserContext* context,
                             const GURL& url1, const GURL& url2);
 
   // Returns the renderer type for this URL.
   static RenderProcessHost::Type RendererTypeForURL(const GURL& url);
 
  protected:
   friend class base::RefCounted<SiteInstance>;
   friend class BrowsingInstance;
 
   // Virtual to allow tests to extend it.
   virtual ~SiteInstance();
 
   // Create a new SiteInstance.  Protected to give access to BrowsingInstance
   // and tests; most callers should use CreateSiteInstance or
   // GetRelatedSiteInstance instead.
   explicit SiteInstance(BrowsingInstance* browsing_instance);
 
   // Get the effective URL for the given actual URL.
-  static GURL GetEffectiveURL(Profile* profile, const GURL& url);
+  static GURL GetEffectiveURL(content::BrowserContext* context,
+                              const GURL& url);
 
   // Returns the type of renderer process this instance belongs in, for grouping
   // purposes.
   RenderProcessHost::Type GetRendererType();
 
  private:
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
@@ skipping 27 matching lines @@
   // The web site that this SiteInstance is rendering pages for.
   GURL site_;
 
   // Whether SetSite has been called.
   bool has_site_;
 
   DISALLOW_COPY_AND_ASSIGN(SiteInstance);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_SITE_INSTANCE_H_