Add site_instance_id to ProcessMap::Item.

chrome/browser/extensions/process_map.h

Index: chrome/browser/extensions/process_map.h
diff --git a/chrome/browser/extensions/process_map.h b/chrome/browser/extensions/process_map.h
index 84c8f86677195d56d2ce718eb67d250dc1ab0fba..f5b1e3bb8d79e9c994a1f12340ae88f95634a21f 100644
--- a/chrome/browser/extensions/process_map.h
+++ b/chrome/browser/extensions/process_map.h
@@ -64,30 +64,23 @@ class ProcessMap {
 
   size_t size() const { return items_.size(); }
 
-  bool Insert(const std::string& extension_id, int process_id);
-  bool Remove(const std::string& extension_id, int process_id);
-  int Remove(int process_id);
+  bool Insert(const std::string& extension_id, int process_id,
+              int site_instance_id);

[Charlie Reis, 2011/12/02 00:45:11]

Ditto.

+
+  bool Remove(const std::string& extension_id, int process_id,
+              int site_instance_id);
+  int RemoveAllFromProcess(int process_id);
+
   bool Contains(const std::string& extension_id, int process_id) const;
   bool Contains(int process_id) const;
 
   std::set<std::string> GetExtensionsInProcess(int process_id) const;
 
  private:
-  struct Item {
-    Item();
-    Item(const Item& other);
-    Item(const std::string& extension_id, int process_id);
-    ~Item();
-
-    // Required for set membership.
-    bool operator<(const Item& other) const;
-
-    std::string extension_id;
-    int process_id;
-  };
+  struct Item;
 
   typedef std::set<Item> ItemSet;
-  std::set<Item> items_;
+  ItemSet items_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessMap);
 };