Move MessagePort implementation from android_webview to content

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 5c6ebdb106a04e887727ef01f4cd833a1213b543..e02596a9f44e75b8cfd5942cab9d567bd6aa71ec 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -73,7 +73,7 @@ class WebBluetoothService;
 }
 
 namespace content {
-
+class AppWebMessagePortMessageFilter;
 class AssociatedInterfaceProviderImpl;
 class CrossProcessFrameConnector;
 class FrameTree;
@@ -310,6 +310,13 @@ class CONTENT_EXPORT RenderFrameHostImpl
     cross_process_frame_connector_ = cross_process_frame_connector;
   }
 
+#if defined(OS_ANDROID)
+  void set_app_web_message_port_delegate(
+      AppWebMessagePortMessageFilter* filter) {
+    app_web_message_port_message_filter_ = filter;
+  }
+#endif
+
   void set_render_frame_proxy_host(RenderFrameProxyHost* proxy) {
     render_frame_proxy_host_ = proxy;
   }
@@ -965,6 +972,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
 
 #if defined(OS_ANDROID)
   std::unique_ptr<InterfaceRegistryAndroid> interface_registry_android_;
+
+  // The filter for MessagePort messages between an Android apps and web.
+  AppWebMessagePortMessageFilter*
+    app_web_message_port_message_filter_;
 #endif
 
   std::unique_ptr<WebBluetoothServiceImpl> web_bluetooth_service_;