Step two of optionally sending messages to/from message ports as base::Value.

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 42 matching lines @@
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/message_port_provider.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/message_port_types.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/auth.h"
 #include "net/cert/x509_certificate.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
@@ skipping 1033 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));
   }
+  std::vector<content::TransferredMessagePort> ports(j_ports.size());
+  for (size_t i = 0; i < j_ports.size(); ++i)
+    ports[i].id = j_ports[i];
   content::MessagePortProvider::PostMessageToFrame(web_contents_.get(),
                                                    source_origin,
                                                    j_target_origin,
                                                    j_message,
-                                                   j_ports);
+                                                   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,
     jobjectArray ports) {
 
   AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, ports,
       GetMessagePortMessageFilter());
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview