Return created channels synchronously

android_webview/native/aw_contents.cc

 // Copyright 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.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 1068 matching lines @@
 
   if (sent_ports != nullptr) {
     base::android::JavaIntArrayToIntVector(env, sent_ports, &j_ports);
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&AwMessagePortServiceImpl::RemoveSentPorts,
                    base::Unretained(AwMessagePortServiceImpl::GetInstance()),
                    j_ports));
   }
-
   content::MessagePortProvider::PostMessageToFrame(web_contents_.get(),
                                                    j_source_origin,
                                                    j_target_origin,
                                                    j_message,
                                                    j_ports);
 }
 
 scoped_refptr<AwMessagePortMessageFilter>
 AwContents::GetMessagePortMessageFilter() {
   // Create a message port message filter if necessary
   if (message_port_message_filter_.get() == nullptr) {
     message_port_message_filter_ =
         new AwMessagePortMessageFilter(
             web_contents_->GetMainFrame()->GetRoutingID());
     web_contents_->GetRenderProcessHost()->AddFilter(
         message_port_message_filter_.get());
   }
   return message_port_message_filter_;
 }
 
 void AwContents::CreateMessageChannel(JNIEnv* env, jobject obj,
-    jobject callback) {
+    jobjectArray ports) {
 
-  AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, callback,
+  AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, ports,
       GetMessagePortMessageFilter());
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview