service worker scaffolding

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 9414cf54822ff9fe117ff4c59690c66aa08d9604..bd61101fc5d482cfa7dd64c24423d3208f296ea4 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host.h
+++ b/content/browser/service_worker/service_worker_dispatcher_host.h
@@ -5,20 +5,23 @@
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_
 
+#include "base/memory/weak_ptr.h"
 #include "content/public/browser/browser_message_filter.h"
 
 class GURL;
 
 namespace content {
 
-class ServiceWorkerContext;
+class ServiceWorkerContextCore;
+class ServiceWorkerContextWrapper;
 
 class ServiceWorkerDispatcherHost : public BrowserMessageFilter {
  public:
   ServiceWorkerDispatcherHost(int render_process_id,
-                              ServiceWorkerContext* context);
+                              ServiceWorkerContextWrapper* context_wrapper);
 
   // BrowserIOMessageFilter implementation
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
 
@@ -34,7 +37,9 @@ class ServiceWorkerDispatcherHost : public BrowserMessageFilter {
   void OnUnregisterServiceWorker(int32 thread_id,
                                  int32 request_id,
                                  const GURL& scope);
-  scoped_refptr<ServiceWorkerContext> context_;
+
+  scoped_refptr<ServiceWorkerContextWrapper> context_wrapper_;

[kinuko, 2013/11/07 03:02:59]

Maybe worth adding some comment to note that this wrapper is used only during
initialization alive only until OnFilterAdded() is called?

+  base::WeakPtr<ServiceWorkerContextCore> context_;
 };
 
 }  // namespace content