Add site_instance_id to ProcessMap::Item.

chrome/browser/extensions/extension_info_map.cc

Index: chrome/browser/extensions/extension_info_map.cc
diff --git a/chrome/browser/extensions/extension_info_map.cc b/chrome/browser/extensions/extension_info_map.cc
index d3210a6f08346a4e77dd9b8c35db2d8f1f36c67c..fdbd66a678d5a2b6a0b602888c0e7ae155714815 100644
--- a/chrome/browser/extensions/extension_info_map.cc
+++ b/chrome/browser/extensions/extension_info_map.cc
@@ -107,8 +107,9 @@ bool ExtensionInfoMap::CanCrossIncognito(const Extension* extension) {
 }
 
 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 << ".";
   }
@@ -116,15 +117,16 @@ void ExtensionInfoMap::RegisterExtensionProcess(const std::string& extension_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(