Flush out initial [un]registerServiceWorker roundtrip

content/child/service_worker/service_worker_message_filter.cc

Index: content/child/service_worker/service_worker_message_filter.cc
diff --git a/content/child/quota_message_filter.cc b/content/child/service_worker/service_worker_message_filter.cc
similarity index 55%
copy from content/child/quota_message_filter.cc
copy to content/child/service_worker/service_worker_message_filter.cc
index db512393b24bf804b59a4e4be1d6f235262d13d0..5908d38044eb06d18c7698173f28208ef8d99781 100644
--- a/content/child/quota_message_filter.cc
+++ b/content/child/service_worker/service_worker_message_filter.cc
@@ -2,35 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/child/quota_message_filter.h"
+#include "content/child/service_worker/service_worker_message_filter.h"
 
+#include "ipc/ipc_message_macros.h"
 #include "base/bind.h"
-#include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/pickle.h"
-#include "content/child/quota_dispatcher.h"
+#include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/thread_safe_sender.h"
-#include "content/common/quota_messages.h"
 #include "webkit/child/worker_task_runner.h"
 
 using webkit_glue::WorkerTaskRunner;
 
 namespace content {
 
-QuotaMessageFilter::QuotaMessageFilter(
-    ThreadSafeSender* thread_safe_sender)
+ServiceWorkerMessageFilter::ServiceWorkerMessageFilter(ThreadSafeSender* sender)
     : main_thread_loop_proxy_(base::MessageLoopProxy::current()),
-      thread_safe_sender_(thread_safe_sender) {
-}
+      thread_safe_sender_(sender) {}
+
+ServiceWorkerMessageFilter::~ServiceWorkerMessageFilter() {}
 
-bool QuotaMessageFilter::OnMessageReceived(const IPC::Message& msg) {
-  if (IPC_MESSAGE_CLASS(msg) != QuotaMsgStart)
+bool ServiceWorkerMessageFilter::OnMessageReceived(const IPC::Message& msg) {
+  if (IPC_MESSAGE_CLASS(msg) != ServiceWorkerMsgStart)
     return false;
   int request_id = -1;
   bool result = PickleIterator(msg).ReadInt(&request_id);
   DCHECK(result);
-  base::Closure closure = base::Bind(
-      &QuotaMessageFilter::DispatchMessage, this, msg);
+  base::Closure closure =
+      base::Bind(&ServiceWorkerMessageFilter::DispatchMessage, this, msg);
   int thread_id = 0;
   {
     base::AutoLock lock(request_id_map_lock_);
@@ -48,16 +47,15 @@ bool QuotaMessageFilter::OnMessageReceived(const IPC::Message& msg) {
   return true;
 }
 
-void QuotaMessageFilter::RegisterRequestID(int request_id, int thread_id) {
+void ServiceWorkerMessageFilter::RegisterRequestID(int request_id,
+                                                   int thread_id) {
   base::AutoLock lock(request_id_map_lock_);
   request_id_map_[request_id] = thread_id;
 }
 
-QuotaMessageFilter::~QuotaMessageFilter() {}
-
-void QuotaMessageFilter::DispatchMessage(const IPC::Message& msg) {
-  QuotaDispatcher::ThreadSpecificInstance(thread_safe_sender_.get(), this)
-      ->OnMessageReceived(msg);
+void ServiceWorkerMessageFilter::DispatchMessage(const IPC::Message& msg) {
+  ServiceWorkerDispatcher::ThreadSpecificInstance(thread_safe_sender_.get(),
+                                                  this)->OnMessageReceived(msg);
 }
 
 }  // namespace content