[Extensions] Finish making port creation asynchronous

extensions/renderer/extension_frame_helper.cc

 // Copyright 2013 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.
 
 #include "extensions/renderer/extension_frame_helper.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/api/messaging/message.h"
@@ skipping 172 matching lines @@
   pending_port_requests_[port_request_id] = callback;
   {
     SCOPED_UMA_HISTOGRAM_TIMER(
         "Extensions.Messaging.GetPortIdSyncTime.Extension");
     render_frame()->Send(new ExtensionHostMsg_OpenChannelToExtension(
         render_frame()->GetRoutingID(), info, channel_name,
         include_tls_channel_id, port_request_id));
   }
 }
 
+void ExtensionFrameHelper::RequestTabPortId(
+    const ExtensionMsg_TabTargetConnectionInfo& info,
+    const std::string& extension_id,
+    const std::string& channel_name,
+    const base::Callback<void(int)>& callback) {
+  int port_request_id = next_port_request_id_++;
+  pending_port_requests_[port_request_id] = callback;
+  {
+    SCOPED_UMA_HISTOGRAM_TIMER("Extensions.Messaging.GetPortIdSyncTime.Tab");
+    render_frame()->Send(new ExtensionHostMsg_OpenChannelToTab(
+        render_frame()->GetRoutingID(), info, extension_id, channel_name,
+        port_request_id));
+  }
+}
+
+void ExtensionFrameHelper::RequestNativePortId(

[lazyboy, 2016/09/13 00:34:39]

nit: RequestNativeAppPortId

[Devlin, 2016/09/13 16:49:55]

Done.

+    const std::string& native_app_name,
+    const base::Callback<void(int)>& callback) {
+  int port_request_id = next_port_request_id_++;
+  pending_port_requests_[port_request_id] = callback;
+  {
+    SCOPED_UMA_HISTOGRAM_TIMER(
+        "Extensions.Messaging.GetPortIdSyncTime.NativeApp");
+    // TODO(devlin): Make this async. crbug.com/642380

[lazyboy, 2016/09/13 00:34:39]

Remove.

[Devlin, 2016/09/13 16:49:55]

Whoops, done.

+    render_frame()->Send(new ExtensionHostMsg_OpenChannelToNativeApp(
+        render_frame()->GetRoutingID(), native_app_name, port_request_id));
+  }
+}
+
 void ExtensionFrameHelper::DidMatchCSS(
     const blink::WebVector<blink::WebString>& newly_matching_selectors,
     const blink::WebVector<blink::WebString>& stopped_matching_selectors) {
   extension_dispatcher_->content_watcher()->DidMatchCSS(
       render_frame()->GetWebFrame(), newly_matching_selectors,
       stopped_matching_selectors);
 }
 
 void ExtensionFrameHelper::DidCreateScriptContext(
     v8::Local<v8::Context> context,
@@ skipping 112 matching lines @@
   DCHECK(iter != pending_port_requests_.end());
   iter->second.Run(port_id);
   pending_port_requests_.erase(iter);
 }
 
 void ExtensionFrameHelper::OnDestruct() {
   delete this;
 }
 
 }  // namespace extensions