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

content/browser/browsing_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/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/content_browser_client.h"
@@ skipping 41 matching lines @@
 
 BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
     Profile* profile, const GURL& url) {
   if (!ShouldUseProcessPerSite(SiteInstance::GetEffectiveURL(profile, 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 profile, creating an entry if necessary.
-  ProfileId runtime_id = profile ? profile->GetRuntimeId()
-                                 : Profile::kInvalidProfileId;
-  return &profile_site_instance_map_[runtime_id];
+  return &profile_site_instance_map_[profile];
 }
 
 bool BrowsingInstance::HasSiteInstance(const GURL& url) {
   std::string site =
       SiteInstance::GetSiteForURL(profile_, url).possibly_invalid_spec();
 
   SiteInstanceMap* map = GetSiteInstanceMap(profile_, url);
   SiteInstanceMap::iterator i = map->find(site);
   return (i != map->end());
 }
@@ skipping 44 matching lines @@
   // comments in RegisterSiteInstance.)
 
   // We look for the site instance in both the local site_instance_map_ and also
   // the static profile_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-profile map.
-    ProfileId runtime_id = profile_ ? profile_->GetRuntimeId()
-                                    : Profile::kInvalidProfileId;
     RemoveSiteInstanceFromMap(
-        &profile_site_instance_map_[runtime_id], site, site_instance);
+        &profile_site_instance_map_[profile_], site, site_instance);
   }
 }
 
 bool BrowsingInstance::RemoveSiteInstanceFromMap(SiteInstanceMap* map,
                                                  const std::string& site,
                                                  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());
 }