Add ChildMessageFilter, a base class for renderer/worker cross-thread MessageFilter

content/child/service_worker/service_worker_message_filter.h

Index: content/child/service_worker/service_worker_message_filter.h
diff --git a/content/child/service_worker/service_worker_message_filter.h b/content/child/service_worker/service_worker_message_filter.h
index 5400e74ecd0e06489156ab867bead9b28a7b531f..e99fe1a9b5411f55363c43b73388c3043227a4b0 100644
--- a/content/child/service_worker/service_worker_message_filter.h
+++ b/content/child/service_worker/service_worker_message_filter.h
@@ -5,31 +5,27 @@
 #ifndef CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_MESSAGE_FILTER_H_
 #define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_MESSAGE_FILTER_H_
 
-#include <map>
-
+#include "content/child/cross_thread_message_filter.h"
 #include "content/common/content_export.h"
-#include "ipc/ipc_channel_proxy.h"
 
 namespace content {
 
 class ThreadSafeSender;
-class MessageLoopProxy;
 
 class CONTENT_EXPORT ServiceWorkerMessageFilter
-    : public IPC::ChannelProxy::MessageFilter {
+    : public NON_EXPORTED_BASE(CrossThreadMessageFilter) {
  public:
   explicit ServiceWorkerMessageFilter(ThreadSafeSender* thread_safe_sender);
 
-  // IPC::Listener implementation
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-
  protected:
   virtual ~ServiceWorkerMessageFilter();
 
  private:
-  void DispatchMessage(const IPC::Message& msg);
+  // CrossThreadMessageFilter implementation:
+  virtual bool OverrideThreadIDForMessage(const IPC::Message& msg,
+                                          int* ipc_thread_id) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
-  scoped_refptr<base::MessageLoopProxy> main_thread_loop_proxy_;
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerMessageFilter);