Delegate WebSocket message handlers to the loading task runner

content/child/websocket_message_filter.h

Index: content/child/websocket_message_filter.h
diff --git a/content/child/websocket_message_filter.h b/content/child/websocket_message_filter.h
new file mode 100644
index 0000000000000000000000000000000000000000..68478fa071d7032a75da73598919cdc3c0911365
--- /dev/null
+++ b/content/child/websocket_message_filter.h
@@ -0,0 +1,48 @@
+// Copyright 2016 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.
+
+#ifndef CONTENT_CHILD_WEBSOCKET_MESSAGE_FILTER_H_
+#define CONTENT_CHILD_WEBSOCKET_MESSAGE_FILTER_H_
+
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "ipc/message_filter.h"
+
+namespace base {
+class SingleThreadTaskRunner;
+}
+
+namespace content {
+
+class WebSocketDispatcher;
+
+// Delegates IPC messages to a WebSocketDispatcher on the loading task queue
+// instead of the default task queue.
+class WebSocketMessageFilter : public IPC::MessageFilter {
+ public:
+  explicit WebSocketMessageFilter(WebSocketDispatcher* websocket_dispatcher);
+
+  // IPC::MessageFilter implementation.
+  bool OnMessageReceived(const IPC::Message& message) override;
+
+  void SetLoadingTaskRunner(
+      scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner) {
+    loading_task_runner_ = loading_task_runner;
+  }
+
+ private:
+  ~WebSocketMessageFilter() override;
+  void OnMessageReceivedOnMainThread(const IPC::Message& message);
+
+  scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner_;
+
+  base::WeakPtr<WebSocketDispatcher> websocket_dispatcher_;

[kinuko, 2016/05/26 10:09:54]

nit: add a comment to note this must be de-ref'ed only on the main thread

[hajimehoshi, 2016/05/26 10:18:42]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(WebSocketMessageFilter);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_CHILD_WEBSOCKET_MESSAGE_FILTER_H_