Fix a couple of bugs relating to sending Tab info with chrome.runtime.connect and

chrome/common/extensions/extension_messages.h

 // Copyright (c) 2012 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.
 
 // IPC messages for extensions.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
@@ skipping 104 matching lines @@
   IPC_STRUCT_MEMBER(int, run_at)
 
   // Whether to execute code in the main world (as opposed to an isolated
   // world).
   IPC_STRUCT_MEMBER(bool, in_main_world)
 
   // Whether the request is coming from a <webview>.
   IPC_STRUCT_MEMBER(bool, is_web_view)
 IPC_STRUCT_END()
 
+// Struct containing the data for external connections to extensions. Used to
+// handle the IPCs initiated by both connect() and onConnect().
+IPC_STRUCT_BEGIN(ExtensionMsg_ExternalConnectionInfo)
+  // The ID of the extension that is the target of the request.
+  IPC_STRUCT_MEMBER(std::string, target_id)
+
+  // The ID of the extension that initiated the request. May be empty if it
+  // wasn't initiated by an extension.
+  IPC_STRUCT_MEMBER(std::string, source_id)
+
+  // The URL of the frame that initiated the request.
+  IPC_STRUCT_MEMBER(GURL, source_url)
+IPC_STRUCT_END()
+
 IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo::IconInfo)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(width)
   IPC_STRUCT_TRAITS_MEMBER(height)
   IPC_STRUCT_TRAITS_MEMBER(data)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo)
   IPC_STRUCT_TRAITS_MEMBER(title)
   IPC_STRUCT_TRAITS_MEMBER(description)
@@ skipping 254 matching lines @@
                     int32 /* install id */,
                     bool /* whether the install was successful */,
                     std::string /* error */)
 
 // Response to the renderer for ExtensionHostMsg_GetAppInstallState.
 IPC_MESSAGE_ROUTED2(ExtensionMsg_GetAppInstallStateResponse,
                     std::string /* state */,
                     int32 /* callback_id */)
 
 // Dispatch the Port.onConnect event for message channels.
-IPC_MESSAGE_ROUTED5(ExtensionMsg_DispatchOnConnect,
+IPC_MESSAGE_ROUTED4(ExtensionMsg_DispatchOnConnect,
                     int /* target_port_id */,
                     std::string /* channel_name */,
-                    std::string /* tab_json */,
-                    std::string /* source_extension_id */,
-                    std::string /* target_extension_id */)
+                    DictionaryValue /* source_tab */,
+                    ExtensionMsg_ExternalConnectionInfo)
 
 // Deliver a message sent with ExtensionHostMsg_PostMessage.
 IPC_MESSAGE_ROUTED2(ExtensionMsg_DeliverMessage,
                     int /* target_port_id */,
                     std::string /* message */)
 
 // Dispatch the Port.onDisconnect event for message channels.
 IPC_MESSAGE_ROUTED2(ExtensionMsg_DispatchOnDisconnect,
                     int /* port_id */,
                     std::string /* error_message */)
@@ skipping 69 matching lines @@
                      DictionaryValue /* filter */,
                      bool /* lazy */)
 
 // Notify the browser that an event has finished being dispatched.
 IPC_MESSAGE_ROUTED0(ExtensionHostMsg_EventAck)
 
 // Open a channel to all listening contexts owned by the extension with
 // the given ID.  This always returns a valid port ID which can be used for
 // sending messages.  If an error occurred, the opener will be notified
 // asynchronously.
-IPC_SYNC_MESSAGE_CONTROL4_1(ExtensionHostMsg_OpenChannelToExtension,
+IPC_SYNC_MESSAGE_CONTROL3_1(ExtensionHostMsg_OpenChannelToExtension,
                             int /* routing_id */,
-                            std::string /* source_extension_id */,
-                            std::string /* target_extension_id */,
+                            ExtensionMsg_ExternalConnectionInfo,
                             std::string /* channel_name */,
                             int /* port_id */)
 
 IPC_SYNC_MESSAGE_CONTROL3_1(ExtensionHostMsg_OpenChannelToNativeApp,
                             int /* routing_id */,
                             std::string /* source_extension_id */,
                             std::string /* native_app_name */,
                             int /* port_id */)
 
 // Get a port handle to the given tab.  The handle can be used for sending
@@ skipping 16 matching lines @@
 IPC_MESSAGE_CONTROL2(ExtensionHostMsg_CloseChannel,
                      int /* port_id */,
                      std::string /* error_message */)
 
 // Used to get the extension message bundle.
 IPC_SYNC_MESSAGE_CONTROL1_1(ExtensionHostMsg_GetMessageBundle,
                             std::string /* extension id */,
                             SubstitutionMap /* message bundle */)
 
 // Sent from the renderer to the browser to return the script running result.
-IPC_MESSAGE_ROUTED5(ExtensionHostMsg_ExecuteCodeFinished,
-                    int /* request id */,
-                    std::string /* error; empty implies success */,
-                    int32 /* page_id the code executed on.
-                             May be -1 if unsuccessful */,
-                    GURL /* URL of the code executed on.
-                            May be empty if unsuccessful. */,
-                    ListValue /* result of the script */)
+IPC_MESSAGE_ROUTED5(
+    ExtensionHostMsg_ExecuteCodeFinished,
+    int /* request id */,
+    std::string /* error; empty implies success */,
+    int32 /* page_id the code executed on.  May be -1 if unsuccessful */,
+    GURL /* URL of the code executed on. May be empty if unsuccessful. */,
+    ListValue /* result of the script */)
 
 // Sent from the renderer to the browser to notify that content scripts are
 // running in the renderer that the IPC originated from.
 // Note that the page_id is for the parent (or more accurately the topmost)
 // frame (e.g. if executing in an iframe this is the page ID of the parent,
 // unless the parent is an iframe... etc).
 IPC_MESSAGE_ROUTED3(ExtensionHostMsg_ContentScriptsExecuting,
                     ExecutingScriptsMap,
                     int32 /* page_id of the _topmost_ frame */,
                     GURL /* url of the _topmost_ frame */)
@@ skipping 67 matching lines @@
 // Notifies the browser process that a tab has started or stopped matching
 // certain conditions.  This message is sent in response to several events:
 //
 // * ExtensionMsg_WatchPages was received, updating the set of conditions.
 // * A new page is loaded.  This will be sent after ViewHostMsg_FrameNavigate.
 //   Currently this only fires for the main frame.
 // * Something changed on an existing frame causing the set of matching searches
 //   to change.
 IPC_MESSAGE_ROUTED1(ExtensionHostMsg_OnWatchedPageChange,
                     std::vector<std::string> /* Matching CSS selectors */)