Flush out initial [un]registerServiceWorker roundtrip

content/child/service_worker/service_worker_dispatcher.h

+// Copyright 2013 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_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
+#define CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_
+
+#include "base/id_map.h"
+#include "base/memory/ref_counted.h"
+#include "base/strings/string16.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerProvider.h"
+#include "webkit/child/worker_task_runner.h"
+
+class GURL;
+
+namespace IPC {
+class Message;
+}
+
+namespace content {
+class ThreadSafeSender;
+class ServiceWorkerMessageFilter;
+class WebServiceWorkerImpl;
+
+class ServiceWorkerDispatcher : public webkit_glue::WorkerTaskRunner::Observer {
+ public:
+  ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender,
+                          ServiceWorkerMessageFilter* message_filter);

[michaeln, 2013/10/07 23:17:34]

Is message_filter still needed? Might as well extract full value from our
simplifications.

[alecflett, 2013/10/07 23:36:51]

nice catch, didn't even realize that. Fully untangled.

+  virtual ~ServiceWorkerDispatcher();
+
+  // webkit_glue::WorkerTaskRunner::Observer implementation.
+  virtual void OnWorkerRunLoopStopped() OVERRIDE;
+
+  void OnMessageReceived(const IPC::Message& msg);
+  bool Send(IPC::Message* msg);
+
+  void RegisterServiceWorker(
+      const string16& pattern,
+      const GURL& script_url,
+      WebKit::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
+  void UnregisterServiceWorker(
+      const string16& pattern,
+      WebKit::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
+
+  // |thread_safe_sender| needs to be passed in because if the call leads to
+  // construction it will be needed.
+  static ServiceWorkerDispatcher* ThreadSpecificInstance(
+      ThreadSafeSender* thread_safe_sender,
+      ServiceWorkerMessageFilter* message_filter);
+
+ private:
+  void OnServiceWorkerRegistered(int32 thread_id,
+                                 int32 request_id,
+                                 int32 worker_id);
+  void OnServiceWorkerUnregistered(int32 thread_id,
+                                   int32 request_id,
+                                   int32 worker_id);
+
+  IDMap<WebKit::WebServiceWorkerProvider::WebServiceWorkerCallbacks,
+        IDMapOwnPointer> pending_callbacks_;
+
+  scoped_refptr<ThreadSafeSender> thread_safe_sender_;
+  scoped_refptr<ServiceWorkerMessageFilter> message_filter_;
+
+  DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcher);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_CHILD_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_H_