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

chrome/browser/extensions/api/messaging/extension_message_port.cc

Index: chrome/browser/extensions/api/messaging/extension_message_port.cc
diff --git a/chrome/browser/extensions/api/messaging/extension_message_port.cc b/chrome/browser/extensions/api/messaging/extension_message_port.cc
index f1510efd099ed070f8bc4339a628448ced79e0e6..e4782c74f2d246165a5fe5d132c8cd76e3bb6d33 100644
--- a/chrome/browser/extensions/api/messaging/extension_message_port.cc
+++ b/chrome/browser/extensions/api/messaging/extension_message_port.cc
@@ -26,12 +26,16 @@ ExtensionMessagePort::ExtensionMessagePort(content::RenderProcessHost* process,
 void ExtensionMessagePort::DispatchOnConnect(
     int dest_port_id,
     const std::string& channel_name,
-    const std::string& tab_json,
+    const base::DictionaryValue& source_tab,
     const std::string& source_extension_id,
-    const std::string& target_extension_id) {
+    const std::string& target_extension_id,
+    const GURL& source_url) {
+  ExtensionMsg_ExternalConnectionInfo info;
+  info.target_id = target_extension_id;
+  info.source_id = source_extension_id;
+  info.source_url = source_url;
   process_->Send(new ExtensionMsg_DispatchOnConnect(
-      routing_id_, dest_port_id, channel_name,
-      tab_json, source_extension_id, target_extension_id));
+      routing_id_, dest_port_id, channel_name, source_tab, info));
 }
 
 void ExtensionMessagePort::DispatchOnDisconnect(