Enable Blink to pass extra Mojo handles across MessagePorts

content/browser/android/app_web_message_port.cc

Index: content/browser/android/app_web_message_port.cc
diff --git a/content/browser/android/app_web_message_port.cc b/content/browser/android/app_web_message_port.cc
index 2e7622cf5416f1b4fe78dfd92eea4eb6868545a9..bc8ddcc376af107ad30f8c64cd0aae89628974a9 100644
--- a/content/browser/android/app_web_message_port.cc
+++ b/content/browser/android/app_web_message_port.cc
@@ -63,7 +63,7 @@ void AppWebMessagePort::PostMessage(
     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(
@@ -79,9 +79,15 @@ jboolean AppWebMessagePort::DispatchNextMessage(
 
   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;