Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1318)

Unified Diff: content/child/child_thread_impl.cc

Issue 2119973002: Port WebSockets to Mojo IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 047c43dd4b8b49440fdb59c01902a67687ac20b0..8ce8064059de7017f8bd0968f0ac4cae3d9ce400 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -50,8 +50,6 @@
#include "content/child/resource_dispatcher.h"
#include "content/child/service_worker/service_worker_message_filter.h"
#include "content/child/thread_safe_sender.h"
-#include "content/child/websocket_dispatcher.h"
-#include "content/child/websocket_message_filter.h"
#include "content/common/child_process_messages.h"
#include "content/common/in_process_child_thread_params.h"
#include "content/common/mojo/mojo_shell_connection_impl.h"
@@ -424,7 +422,6 @@ void ChildThreadImpl::Init(const Options& options) {
resource_dispatcher_.reset(new ResourceDispatcher(
this, message_loop()->task_runner()));
- websocket_dispatcher_.reset(new WebSocketDispatcher);
file_system_dispatcher_.reset(new FileSystemDispatcher());
histogram_message_filter_ = new ChildHistogramMessageFilter();
@@ -442,16 +439,12 @@ void ChildThreadImpl::Init(const Options& options) {
new NotificationDispatcher(thread_safe_sender_.get());
push_dispatcher_ = new PushDispatcher(thread_safe_sender_.get());
- websocket_message_filter_ =
- new WebSocketMessageFilter(websocket_dispatcher_.get());
-
channel_->AddFilter(histogram_message_filter_.get());
channel_->AddFilter(resource_message_filter_.get());
channel_->AddFilter(quota_message_filter_->GetFilter());
channel_->AddFilter(notification_dispatcher_->GetFilter());
channel_->AddFilter(push_dispatcher_->GetFilter());
channel_->AddFilter(service_worker_message_filter_->GetFilter());
- channel_->AddFilter(websocket_message_filter_.get());
if (!IsInBrowserProcess()) {
// In single process mode, browser-side tracing and memory will cover the

Powered by Google App Engine
This is Rietveld 408576698