Port WebSockets to Mojo IPC

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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 "content/browser/frame_host/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 33 matching lines @@
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #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"
 #include "content/common/input_messages.h"
 #include "content/common/inter_process_time_ticks_converter.h"
 #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"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 1952 matching lines @@
                  base::Unretained(permission_service_context_.get())));
 
   GetServiceRegistry()->AddService(base::Bind(
       &PresentationServiceImpl::CreateMojoService, base::Unretained(this)));
 
 #if !defined(OS_ANDROID)
   GetServiceRegistry()->AddService(
       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)
   enable_web_bluetooth = true;
 #endif
 
   if (enable_web_bluetooth) {
     GetServiceRegistry()->AddService(
         base::Bind(&RenderFrameHostImpl::CreateWebBluetoothService,
                    base::Unretained(this)));
@@ skipping 879 matching lines @@
   // For the root frame tree node, also store the AXTreeID of the focused frame.
   FrameTreeNode* focused_frame_tree_node = frame_tree_->GetFocusedFrame();
   if (!focused_frame_tree_node)
     return;
   RenderFrameHostImpl* focused_frame =
       focused_frame_tree_node->current_frame_host();
   DCHECK(focused_frame);
   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_);
   web_bluetooth_service_.reset(
       new WebBluetoothServiceImpl(this, std::move(request)));
   // RFHI owns web_bluetooth_service_ and web_bluetooth_service owns the
   // binding_ which may run the error handler. binding_ can't run the error
   // handler after it's destroyed so it can't run after the RFHI is destroyed.
   web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
       &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
 }
 
 void RenderFrameHostImpl::DeleteWebBluetoothService() {
   web_bluetooth_service_.reset();
 }
 
 }  // namespace content