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 943b1cc920129c011fed4b6b27b1764749f8b030..8aba07c0049bb78914c4ede8ab3bda37f2c72f20 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -69,7 +69,7 @@ class WebBluetoothService;
 }
 
 namespace content {
-
+class AppWebMessagePortMessageFilter;
 class AssociatedInterfaceProviderImpl;
 class CrossProcessFrameConnector;
 class FrameTree;
@@ -306,6 +306,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;
   }
@@ -960,6 +967,12 @@ class CONTENT_EXPORT RenderFrameHostImpl
   std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
   std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
 
+#if defined(OS_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_;
 
   // The object managing the accessibility tree for this frame.