Enable Blink to pass extra Mojo handles across MessagePorts

content/browser/android/app_web_message_port.cc

 // Copyright 2017 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 "content/browser/android/app_web_message_port.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "content/browser/android/string_message_codec.h"
@@ skipping 45 matching lines @@
   delete this;
 }
 
 void AppWebMessagePort::PostMessage(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jstring>& jmessage,
     const base::android::JavaParamRef<jobjectArray>& jports) {
   port_.PostMessage(
       EncodeStringMessage(base::android::ConvertJavaStringToUTF16(jmessage)),
-      UnwrapJavaArray(env, jports));
+      UnwrapJavaArray(env, jports), std::vector<mojo::ScopedHandle>());
 }
 
 jboolean AppWebMessagePort::DispatchNextMessage(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller) {
   base::android::ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
 
   jmethodID app_web_message_port_constructor =
       base::android::MethodID::Get<base::android::MethodID::TYPE_INSTANCE>(
           env, AppWebMessagePort_clazz(env), "<init>", "()V");
 
   base::string16 encoded_message;
   std::vector<MessagePort> ports;
-  if (!port_.GetMessage(&encoded_message, &ports))
+  std::vector<mojo::ScopedHandle> handles;
+  if (!port_.GetMessage(&encoded_message, &ports, &handles))
     return false;
 
+  if (!handles.empty()) {
+    DLOG(WARNING) << "Unexpected handles";
+    return false;
+  }
+
   base::string16 message;
   if (!DecodeStringMessage(encoded_message, &message))
     return false;
 
   base::android::ScopedJavaLocalRef<jstring> jmessage =
       base::android::ConvertUTF16ToJavaString(env, message);
 
   base::android::ScopedJavaLocalRef<jobjectArray> jports;
   if (ports.size() > 0) {
     jports = base::android::ScopedJavaLocalRef<jobjectArray>(
@@ skipping 63 matching lines @@
   AppWebMessagePort::CreateAndBindToJavaObject(
       env, std::move(pipe.handle0), jport0);
 
   base::android::ScopedJavaLocalRef<jobject> jport1(
       env, env->GetObjectArrayElement(ports.obj(), 1));
   AppWebMessagePort::CreateAndBindToJavaObject(
       env, std::move(pipe.handle1), jport1);
 }
 
 }  // namespace content