[Extensions] Finish making port creation asynchronous

chrome/browser/renderer_host/chrome_extension_message_filter.cc

Index: chrome/browser/renderer_host/chrome_extension_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.cc b/chrome/browser/renderer_host/chrome_extension_message_filter.cc
index 1533889e36885c2947d0d464e816d1d08e135233..b1b9fedc4aa1f324cde717cd3d0c401c9ad17937 100644
--- a/chrome/browser/renderer_host/chrome_extension_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_extension_message_filter.cc
@@ -166,9 +166,11 @@ void ChromeExtensionMessageFilter::OpenChannelToExtensionOnUIThread(
 void ChromeExtensionMessageFilter::OnOpenChannelToNativeApp(
     int routing_id,
     const std::string& native_app_name,
-    int* port_id) {
-  int port2_id;
-  extensions::MessageService::AllocatePortIdPair(port_id, &port2_id);
+    int request_id) {
+  int port1_id = 0;
+  int port2_id = 0;
+  extensions::MessageService::AllocatePortIdPair(&port1_id, &port2_id);
+  Send(new ExtensionMsg_AssignPortId(routing_id, port1_id, request_id));
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
@@ -196,9 +198,11 @@ void ChromeExtensionMessageFilter::OnOpenChannelToTab(
     const ExtensionMsg_TabTargetConnectionInfo& info,
     const std::string& extension_id,
     const std::string& channel_name,
-    int* port_id) {
-  int port2_id;
-  extensions::MessageService::AllocatePortIdPair(port_id, &port2_id);
+    int request_id) {
+  int port1_id = 0;
+  int port2_id = 0;
+  extensions::MessageService::AllocatePortIdPair(&port1_id, &port2_id);
+  Send(new ExtensionMsg_AssignPortId(routing_id, port1_id, request_id));
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,