Chrome-side of fixes for content-script messaging.

chrome/renderer/extensions/bindings_utils.h

Index: chrome/renderer/extensions/bindings_utils.h
diff --git a/chrome/renderer/extensions/bindings_utils.h b/chrome/renderer/extensions/bindings_utils.h
index 2e8935a5e4b24c757b0ac9f37e24fe33aaaf3f37..2c81b0cb6fd99ae5565a6261a05c750d6238a782 100644
--- a/chrome/renderer/extensions/bindings_utils.h
+++ b/chrome/renderer/extensions/bindings_utils.h
@@ -61,9 +61,15 @@ struct ContextInfo {
   v8::Persistent<v8::Context> context;
   std::string extension_id;  // empty if the context is not an extension
 
+  // If this context is a content script, parent will be the frame that it
+  // was injected in.  This is empty if the context is not a content script.
+  v8::Persistent<v8::Context> parent_context;
+
   ContextInfo(v8::Persistent<v8::Context> context,
-              const std::string& extension_id)
-      : context(context), extension_id(extension_id) {}
+              const std::string& extension_id,
+              v8::Persistent<v8::Context> parent_context)
+      : context(context), extension_id(extension_id),
+        parent_context(parent_context) {}
 };
 typedef std::list< linked_ptr<ContextInfo> > ContextList;