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

chrome/browser/renderer_host/chrome_render_message_filter.cc

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index f8524e9c04dc1b29f5faf10e47f70c14704d03e2..0c59aac9e5b560c57358a8ec6f453c9d377dd50d 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -374,30 +374,29 @@ void ChromeRenderMessageFilter::OnV8HeapStats(int v8_memory_allocated,
 }
 
 void ChromeRenderMessageFilter::OnOpenChannelToExtension(
-    int routing_id, const std::string& source_extension_id,
-    const std::string& target_extension_id,
+    int routing_id,
+    const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& channel_name, int* port_id) {
   int port2_id;
   extensions::MessageService::AllocatePortIdPair(port_id, &port2_id);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread,
-                 this, render_process_id_, routing_id, port2_id,
-                 source_extension_id, target_extension_id, channel_name));
+      base::Bind(
+          &ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread, this,
+          render_process_id_, routing_id, port2_id, info, channel_name));
 }
 
 void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
     int source_process_id, int source_routing_id,
     int receiver_port_id,
-    const std::string& source_extension_id,
-    const std::string& target_extension_id,
+    const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   extensions::ExtensionSystem::Get(profile_)->message_service()->
       OpenChannelToExtension(
           source_process_id, source_routing_id, receiver_port_id,
-          source_extension_id, target_extension_id, channel_name);
+          info.source_id, info.target_id, info.source_url, channel_name);
 }
 
 void ChromeRenderMessageFilter::OnOpenChannelToNativeApp(