Add site_instance_id to ProcessMap::Item.

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 420 matching lines @@
   if (!service)
     return;
 
   const Extension* extension =
       service->GetExtensionByURL(site_instance->site());
   if (!extension)
     extension = service->GetExtensionByWebExtent(site_instance->site());
   if (!extension)
     return;
 
-  service->process_map()->Insert(
-      extension->id(), site_instance->GetProcess()->GetID());
+  service->process_map()->Insert(extension->id(),
+                                 site_instance->GetProcess()->GetID(),
+                                 site_instance->id());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::RegisterExtensionProcess,
                  profile->GetExtensionInfoMap(),
                  extension->id(),
-                 site_instance->GetProcess()->GetID()));
+                 site_instance->GetProcess()->GetID(),
+                 site_instance->id()));
 }
 
 void ChromeContentBrowserClient::SiteInstanceDeleting(
     SiteInstance* site_instance) {
   if (!site_instance->HasProcess())
     return;
 
   Profile* profile = Profile::FromBrowserContext(
       site_instance->browsing_instance()->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
   const Extension* extension =
       service->GetExtensionByURL(site_instance->site());
   if (!extension)
     extension = service->GetExtensionByWebExtent(site_instance->site());
   if (!extension)
     return;
 
-  service->process_map()->Remove(
-      extension->id(), site_instance->GetProcess()->GetID());
+  service->process_map()->Remove(extension->id(),
+                                 site_instance->GetProcess()->GetID(),
+                                 site_instance->id());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::UnregisterExtensionProcess,
                  profile->GetExtensionInfoMap(),
                  extension->id(),
-                 site_instance->GetProcess()->GetID()));
+                 site_instance->GetProcess()->GetID(),
+                 site_instance->id()));
 }
 
 bool ChromeContentBrowserClient::ShouldSwapProcessesForNavigation(
     const GURL& current_url,
     const GURL& new_url) {
   if (current_url.is_empty()) {
     // Always choose a new process when navigating to extension URLs. The
     // process grouping logic will combine all of a given extension's pages
     // into the same process.
     if (new_url.SchemeIs(chrome::kExtensionScheme))
@@ skipping 624 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome