More scaffolding, add class ServiceWorkerProviderHost.

content/browser/service_worker/service_worker_dispatcher_host.h

Index: content/browser/service_worker/service_worker_dispatcher_host.h
diff --git a/content/browser/service_worker/service_worker_dispatcher_host.h b/content/browser/service_worker/service_worker_dispatcher_host.h
index 48a0a58c9958f1c2a39e51cb835d0c176a829c12..4b512fa41a3e467f9008d383056f314132d01fe7 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host.h
+++ b/content/browser/service_worker/service_worker_dispatcher_host.h
@@ -6,6 +6,7 @@
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_
 
 #include "base/memory/weak_ptr.h"
+#include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/public/browser/browser_message_filter.h"
 
 class GURL;
@@ -14,6 +15,7 @@ namespace content {
 
 class ServiceWorkerContextCore;
 class ServiceWorkerContextWrapper;
+class ServiceWorkerProviderHost;
 
 class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
  public:
@@ -22,6 +24,7 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
   void Init(ServiceWorkerContextWrapper* context_wrapper);
 
   // BrowserIOMessageFilter implementation
+  virtual void OnDestruct() const OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
 
@@ -29,6 +32,8 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
   virtual ~ServiceWorkerDispatcherHost();
 
  private:
+  friend class BrowserThread;

[alecflett, 2013/11/18 23:40:22]

Why is BrowserThread a friend?

[michaeln, 2013/11/19 01:14:26]

for BrowserThread::DeleteOnIOThread::Destruct(this)

+  friend class base::DeleteHelper<ServiceWorkerDispatcherHost>;
   friend class TestingServiceWorkerDispatcherHost;
 
   // IPC Message handlers
@@ -39,8 +44,17 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
   void OnUnregisterServiceWorker(int32 thread_id,
                                  int32 request_id,
                                  const GURL& scope);
+  void OnProviderCreated(int provider_id);
+  void OnProviderDestroyed(int provider_id);
 
+  ServiceWorkerProviderHost* GetProviderHost(int provider_id);
+
+  int render_process_id_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
+
+  // This object owns the provider host instances for providers
+  // in our render process.
+  ServiceWorkerProviderHostMap providers_;
 };
 
 }  // namespace content