Return created channels synchronously

android_webview/native/aw_message_port_service_impl.h

 // Copyright 2015 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.
 
 #ifndef ANDROID_WEBVIEW_NATIVE_AW_MESSAGE_PORT_SERVICE_IMPL_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_MESSAGE_PORT_SERVICE_IMPL_H_
 
 #include <jni.h>
 #include <map>
 
@@ skipping 11 matching lines @@
 // Threading: Created and initialized on UI thread. For other methods, see
 // the method level DCHECKS or documentation.
 class AwMessagePortServiceImpl : public AwMessagePortService {
  public:
   static AwMessagePortServiceImpl* GetInstance();
 
   AwMessagePortServiceImpl();
   ~AwMessagePortServiceImpl() override;
   void Init(JNIEnv* env, jobject object);
 
-  void CreateMessageChannel(JNIEnv* env, jobject callback,
+  void CreateMessageChannel(JNIEnv* env, jobjectArray ports,
       scoped_refptr<AwMessagePortMessageFilter> filter);
 
   // AwMessagePortService implementation
   void OnConvertedWebToAppMessage(
       int message_port_id,
       const base::ListValue& message,
       const std::vector<int>& sent_message_port_ids) override;
   void OnMessagePortMessageFilterClosing(
       AwMessagePortMessageFilter* filter) override;
 
   // Methods called from Java.
   void PostAppToWebMessage(JNIEnv* env, jobject object, int sender_id,
       jstring message, jintArray sent_ports);
 
   void RemoveSentPorts(const std::vector<int>& sent_ports);
 
 private:
   void PostAppToWebMessageOnIOThread(
       int sender_id,
       base::string16* message,
       std::vector<int>* sent_ports);
   void CreateMessageChannelOnIOThread(
       scoped_refptr<AwMessagePortMessageFilter> filter,
       int* port1,
       int* port2);
   void OnMessageChannelCreated(
-      base::android::ScopedJavaGlobalRef<jobject>* callback,
+      base::android::ScopedJavaGlobalRef<jobjectArray>* ports,
       int* port1,
       int* port2);
   void AddPort(int message_port_id, AwMessagePortMessageFilter* filter);
 
   JavaObjectWeakGlobalRef java_ref_;
   typedef std::map<int, AwMessagePortMessageFilter*> MessagePorts;
   MessagePorts ports_; // Access on IO thread
 
   DISALLOW_COPY_AND_ASSIGN(AwMessagePortServiceImpl);
 };
 
 bool RegisterAwMessagePortService(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_MESSAGE_PORT_SERVICE_IMPL_H_