HTML MessagePort as mojo::MessagePipeHandle

content/browser/message_port_provider.cc

Index: content/browser/message_port_provider.cc
diff --git a/content/browser/message_port_provider.cc b/content/browser/message_port_provider.cc
index aa6ae9567bf6aba436ec979b8773282dde027690..c335a22966f61abe9e48f5b96b4c363326834cc4 100644
--- a/content/browser/message_port_provider.cc
+++ b/content/browser/message_port_provider.cc
@@ -5,8 +5,6 @@
 #include "content/public/browser/message_port_provider.h"
 
 #include "content/browser/browser_thread_impl.h"
-#include "content/browser/message_port_message_filter.h"
-#include "content/browser/message_port_service.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ -25,16 +23,9 @@ void MessagePortProvider::PostMessageToFrame(
     const base::string16& source_origin,
     const base::string16& target_origin,
     const base::string16& data,
-    const std::vector<int>& ports) {
+    const std::vector<MessagePort>& ports) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-#if defined(OS_ANDROID)
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&content::AppWebMessagePortServiceImpl::RemoveSentPorts,
-                 base::Unretained(AppWebMessagePortServiceImpl::GetInstance()),
-                 ports));
-#endif
   FrameMsg_PostMessage_Params params;
   params.is_data_raw_string = true;
   params.data = data;
@@ -43,13 +34,8 @@ void MessagePortProvider::PostMessageToFrame(
   params.target_origin = target_origin;
   params.message_ports = ports;
 
-  RenderProcessHostImpl* rph =
-      static_cast<RenderProcessHostImpl*>(web_contents->GetRenderProcessHost());
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts,
-                 rph->message_port_message_filter(),
-                 web_contents->GetMainFrame()->GetRoutingID(), params));
+  RenderFrameHost* rfh = web_contents->GetMainFrame();
+  rfh->Send(new FrameMsg_PostMessageEvent(rfh->GetRoutingID(), params));
 }
 
 #if defined(OS_ANDROID)