HTML MessagePort as mojo::MessagePipeHandle

content/browser/web_contents/web_contents_android.cc

Index: content/browser/web_contents/web_contents_android.cc
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
index fd9a51a437b9fb8c947aeea65c0696fea02c17b0..e955825491a1586af1fb8c16593cdb1928ddb855 100644
--- a/content/browser/web_contents/web_contents_android.cc
+++ b/content/browser/web_contents/web_contents_android.cc
@@ -17,6 +17,7 @@
 #include "base/memory/ptr_util.h"
 #include "content/browser/accessibility/browser_accessibility_android.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
+#include "content/browser/android/app_web_message_port.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
@@ -564,14 +565,13 @@ void WebContentsAndroid::PostMessageToFrame(
     const JavaParamRef<jstring>& jframe_name,
     const JavaParamRef<jstring>& jmessage,
     const JavaParamRef<jstring>& jtarget_origin,
-    const JavaParamRef<jintArray>& jsent_ports) {
+    const JavaParamRef<jobjectArray>& jports) {
   base::string16 source_origin;
   base::string16 target_origin(ConvertJavaStringToUTF16(env, jtarget_origin));
   base::string16 message(ConvertJavaStringToUTF16(env, jmessage));
-  std::vector<int> ports;
+  std::vector<MessagePort> ports(
+      AppWebMessagePort::UnwrapJavaArray(env, jports));
 
-  if (!jsent_ports.is_null())
-    base::android::JavaIntArrayToIntVector(env, jsent_ports, &ports);
   content::MessagePortProvider::PostMessageToFrame(
       web_contents_, source_origin, target_origin, message, ports);
 }