Port WebSockets to Mojo IPC

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1ecd4bd7d3b4f0de2344ea97969ecdbcf9674201..f862450612e43e230acf228e9532c8427aa01713 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -51,6 +51,7 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/wake_lock/wake_lock_service_context.h"
+#include "content/browser/websocket/websocket_manager.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/frame_messages.h"
@@ -59,6 +60,7 @@
 #include "content/common/navigation_params.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/swapped_out_messages.h"
+#include "content/common/websocket.mojom.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_context.h"
@@ -2031,6 +2033,10 @@ void RenderFrameHostImpl::RegisterMojoServices() {
       base::Bind(&device::VibrationManagerImpl::Create));
 #endif
 
+  GetServiceRegistry()->AddService(

[Ben Goodger (Google), 2016/07/01 21:19:51]

When you rebase, you'll find that this is

GetInterfaceRegistry()->AddInterface() :-)

[darin (slow to review), 2016/07/06 16:57:21]

Done.

+      base::Bind(&RenderFrameHostImpl::CreateWebSocket,
+                 base::Unretained(this)));

[Ben Goodger (Google), 2016/07/01 21:19:51]

See:
https://chromium.googlesource.com/chromium/src/+/master/services/shell/public...

Since your WebSocketManager doesn't seem to have any UI thread state (other than
its ownership by RPH), you could bind this function to a factory method on it
and pass the IO thread task runner here.

[darin (slow to review), 2016/07/06 16:57:21]

This is at odds with constructing the WebSocketManager lazily (as that should
happen on the UI thread), and I like that change, so I will have to continue
having a thunk here on the UI thread.

+
   bool enable_web_bluetooth = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableWebBluetooth);
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
@@ -2930,6 +2936,12 @@ void RenderFrameHostImpl::AXContentTreeDataToAXTreeData(
   dst->focused_tree_id = focused_frame->GetAXTreeID();
 }
 
+void RenderFrameHostImpl::CreateWebSocket(
+    mojo::InterfaceRequest<mojom::WebSocket> request) {
+  static_cast<RenderProcessHostImpl*>(process_)->websocket_manager()->
+      CreateWebSocket(routing_id_, std::move(request));
+}
+
 void RenderFrameHostImpl::CreateWebBluetoothService(
     blink::mojom::WebBluetoothServiceRequest request) {
   DCHECK(!web_bluetooth_service_);