Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ...

content/browser/browsing_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_BROWSING_INSTANCE_H_
 #define CONTENT_BROWSER_BROWSING_INSTANCE_H_
 #pragma once
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/profiles/profile.h"
 
 class GURL;
+class Profile;
 class SiteInstance;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // BrowsingInstance class
 //
 // A browsing instance corresponds to the notion of a "unit of related browsing
 // contexts" in the HTML 5 spec.  Intuitively, it represents a collection of
 // tabs and frames that can have script connections to each other.  In that
 // sense, it reflects the user interface, and not the contents of the tabs and
@@ skipping 62 matching lines @@
   void UnregisterSiteInstance(SiteInstance* site_instance);
 
  protected:
   friend class base::RefCounted<BrowsingInstance>;
 
   // Virtual to allow tests to extend it.
   virtual ~BrowsingInstance();
 
  private:
   // Map of site to SiteInstance, to ensure we only have one SiteInstance per
-  // site.  The site string should be the possibly_invalid_spec() of a GURL
-  // obtained with SiteInstance::GetSiteForURL.
   typedef base::hash_map<std::string, SiteInstance*> SiteInstanceMap;
 
-  // Map of Profile runtime Id to SiteInstanceMap, for use in the
+  // Map of Profile to SiteInstanceMap, for use in the process-per-site model.
   // process-per-site model.
-  typedef base::hash_map<ProfileId, SiteInstanceMap> ProfileSiteInstanceMap;
+  typedef base::hash_map<Profile*, SiteInstanceMap> ProfileSiteInstanceMap;
 
   // Returns a pointer to the relevant SiteInstanceMap for this object.  If the
   // process-per-site model is in use, or if process-per-site-instance is in
   // use and |url| matches a site for which we always use one process (e.g.,
   // the new tab page), then this returns the SiteInstanceMap for the entire
   // profile.  If not, this returns the BrowsingInstance's own private
   // SiteInstanceMap.
   SiteInstanceMap* GetSiteInstanceMap(Profile* profile, const GURL& url);
 
   // Utility routine which removes the passed SiteInstance from the passed
@@ skipping 13 matching lines @@
   // This field is only used if we are not using process-per-site.
   SiteInstanceMap site_instance_map_;
 
   // Global map of Profile to SiteInstanceMap, for process-per-site.
   static ProfileSiteInstanceMap profile_site_instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
 };
 
 #endif  // CONTENT_BROWSER_BROWSING_INSTANCE_H_