Committing change 255087 for Roger:...

chrome/browser/browsing_instance.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 35 matching lines @@
 
 BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
     Profile* profile, const GURL& url) {
   if (!ShouldUseProcessPerSite(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.
-  return &profile_site_instance_map_[profile];
+  ProfileId runtime_id = profile ? profile->GetRuntimeId()
+                                 : Profile::InvalidProfileId;
+  return &profile_site_instance_map_[runtime_id];
 }
 
 bool BrowsingInstance::HasSiteInstance(const GURL& url) {
   std::string site = SiteInstance::GetSiteForURL(url).possibly_invalid_spec();
 
   SiteInstanceMap* map = GetSiteInstanceMap(profile_, url);
   SiteInstanceMap::iterator i = map->find(site);
   return (i != map->end());
 }
 
@@ skipping 40 matching lines @@
   // 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.)
   SiteInstanceMap* map = GetSiteInstanceMap(profile_, site_instance->site());
   SiteInstanceMap::iterator i = map->find(site);
   if (i != map->end() && i->second == site_instance) {
     // Matches, so erase it.
     map->erase(i);
   }
 }