Flush out initial [un]registerServiceWorker roundtrip

content/child/child_thread.cc

Index: content/child/child_thread.cc
diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
index 95b36c6dcff26f4482ce3818ae4dfcc5179cdbe5..bd532a3c28f8579a6f3c798842d89cc885de0cfc 100644
--- a/content/child/child_thread.cc
+++ b/content/child/child_thread.cc
@@ -4,6 +4,8 @@
 
 #include "content/child/child_thread.h"
 
+#include <string>
+
 #include "base/allocator/allocator_extension.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ -25,6 +27,8 @@
 #include "content/child/quota_dispatcher.h"
 #include "content/child/quota_message_filter.h"
 #include "content/child/resource_dispatcher.h"
+#include "content/child/service_worker/service_worker_dispatcher.h"
+#include "content/child/service_worker/service_worker_message_filter.h"
 #include "content/child/socket_stream_dispatcher.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/websocket_dispatcher.h"
@@ -180,6 +184,11 @@ void ChildThread::Init() {
   resource_message_filter_ =
       new ChildResourceMessageFilter(resource_dispatcher());
 
+  service_worker_message_filter_ =
+      new ServiceWorkerMessageFilter(thread_safe_sender_.get());
+  service_worker_dispatcher_.reset(new ServiceWorkerDispatcher(
+      thread_safe_sender_.get()));
+
   quota_message_filter_ =
       new QuotaMessageFilter(thread_safe_sender_.get());
   quota_dispatcher_.reset(new QuotaDispatcher(thread_safe_sender_.get(),
@@ -191,6 +200,7 @@ void ChildThread::Init() {
       ChildProcess::current()->io_message_loop_proxy()));
   channel_->AddFilter(resource_message_filter_.get());
   channel_->AddFilter(quota_message_filter_.get());
+  channel_->AddFilter(service_worker_message_filter_.get());
 
   // In single process mode we may already have a power monitor
   if (!base::PowerMonitor::Get()) {
@@ -253,6 +263,7 @@ ChildThread::~ChildThread() {
 #endif
 
   channel_->RemoveFilter(quota_message_filter_.get());
+  channel_->RemoveFilter(service_worker_message_filter_.get());

[kinuko, 2013/10/25 15:28:00]

nit: we usually  remove filters in reverse of initialization order

[alecflett, 2013/10/25 18:22:50]

Done.

   channel_->RemoveFilter(histogram_message_filter_.get());
   channel_->RemoveFilter(sync_message_filter_.get());