Add site_instance_id to ProcessMap::Item.

chrome/browser/extensions/extension_info_map.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/extensions/extension_info_map.h"
 
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 89 matching lines @@
   return false;
 }
 
 bool ExtensionInfoMap::CanCrossIncognito(const Extension* extension) {
   // This is duplicated from ExtensionService :(.
   return IsIncognitoEnabled(extension->id()) &&
       !extension->incognito_split_mode();
 }
 
 void ExtensionInfoMap::RegisterExtensionProcess(const std::string& extension_id,
-                                                int process_id) {
-  if (!process_map_.Insert(extension_id, process_id)) {
+                                                int process_id,
+                                                int site_instance_id) {
+  if (!process_map_.Insert(extension_id, process_id, site_instance_id)) {
     NOTREACHED() << "Duplicate extension process registration for: "
                  << extension_id << "," << process_id << ".";
   }
 }
 
 void ExtensionInfoMap::UnregisterExtensionProcess(
     const std::string& extension_id,
-    int process_id) {
-  if (!process_map_.Remove(extension_id, process_id)) {
+    int process_id,
+    int site_instance_id) {
+  if (!process_map_.Remove(extension_id, process_id, site_instance_id)) {
     NOTREACHED() << "Unknown extension process registration for: "
                  << extension_id << "," << process_id << ".";
   }
 }
 
 void ExtensionInfoMap::UnregisterAllExtensionsInProcess(int process_id) {
-  process_map_.Remove(process_id);
+  process_map_.RemoveAllFromProcess(process_id);
 }
 
 bool ExtensionInfoMap::SecurityOriginHasAPIPermission(
     const GURL& origin, int process_id,
     ExtensionAPIPermission::ID permission) const {
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
     const std::string& id = origin.host();
     return extensions_.GetByID(id)->HasAPIPermission(permission) &&
         process_map_.Contains(id, process_id);
   }
 
   ExtensionSet::ExtensionMap::const_iterator i = extensions_.begin();
   for (; i != extensions_.end(); ++i) {
     if (i->second->web_extent().MatchesSecurityOrigin(origin) &&
         process_map_.Contains(i->first, process_id) &&
         i->second->HasAPIPermission(permission)) {
       return true;
     }
   }
   return false;
 }