service worker scaffolding

content/browser/service_worker/service_worker_dispatcher_host_unittest.cc

Index: content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
diff --git a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
index 1bd18fbec04d6f810e7d8377b37b3013304f990c..ad62568c85d5f99307c564eeb6fa9d4cf50c74fd 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
+++ b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "content/browser/service_worker/service_worker_context.h"
+#include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/common/service_worker_messages.h"
 #include "content/public/common/content_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -18,26 +18,25 @@ namespace content {
 class ServiceWorkerDispatcherHostTest : public testing::Test {
  protected:
   virtual void SetUp() {
-    context_ = new ServiceWorkerContext(base::FilePath(), NULL);
+    context_.reset(new ServiceWorkerContextCore(base::FilePath(), NULL));
   }
 
   virtual void TearDown() {
-    DCHECK(context_->HasOneRef());
-    context_ = NULL;
+    context_.reset();
   }
 
-  scoped_refptr<ServiceWorkerContext> context_;
+  scoped_ptr<ServiceWorkerContextCore> context_;
 };
 
-namespace {
-
 static const int kRenderProcessId = 1;
 
 class TestingServiceWorkerDispatcherHost : public ServiceWorkerDispatcherHost {
  public:
   TestingServiceWorkerDispatcherHost(int process_id,
-                                     ServiceWorkerContext* context)
-      : ServiceWorkerDispatcherHost(process_id, context) {}
+                                     ServiceWorkerContextCore* context)
+      : ServiceWorkerDispatcherHost(process_id) {
+    context_ = context->AsWeakPtr();

[kinuko, 2013/11/09 09:39:56]

Hmm.. ok.

+  }
 
   virtual bool Send(IPC::Message* message) OVERRIDE {
     sent_messages_.push_back(message);
@@ -50,14 +49,12 @@ class TestingServiceWorkerDispatcherHost : public ServiceWorkerDispatcherHost {
   virtual ~TestingServiceWorkerDispatcherHost() {}
 };
 
-}  // namespace
-
 TEST_F(ServiceWorkerDispatcherHostTest, DisabledCausesError) {
   DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kEnableServiceWorker));
 
   scoped_refptr<TestingServiceWorkerDispatcherHost> dispatcher_host =
-      new TestingServiceWorkerDispatcherHost(kRenderProcessId, context_);
+      new TestingServiceWorkerDispatcherHost(kRenderProcessId, context_.get());
 
   bool handled;
   dispatcher_host->OnMessageReceived(
@@ -79,7 +76,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, Enabled) {
       switches::kEnableServiceWorker);
 
   scoped_refptr<TestingServiceWorkerDispatcherHost> dispatcher_host =
-      new TestingServiceWorkerDispatcherHost(kRenderProcessId, context_);
+      new TestingServiceWorkerDispatcherHost(kRenderProcessId, context_.get());
 
   bool handled;
   dispatcher_host->OnMessageReceived(
@@ -93,4 +90,28 @@ TEST_F(ServiceWorkerDispatcherHostTest, Enabled) {
             dispatcher_host->sent_messages_[0]->type());
 }
 
+TEST_F(ServiceWorkerDispatcherHostTest, EarlyContextDeletion) {
+  DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kEnableServiceWorker));
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableServiceWorker);
+
+  scoped_refptr<TestingServiceWorkerDispatcherHost> dispatcher_host =
+      new TestingServiceWorkerDispatcherHost(kRenderProcessId, context_.get());
+
+  context_.reset();
+
+  bool handled;
+  dispatcher_host->OnMessageReceived(
+      ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, GURL(), GURL()),
+      &handled);
+  DCHECK(handled);
+
+  // TODO(alecflett): Pump the message loop when this becomes async.
+  DCHECK_EQ(1UL, dispatcher_host->sent_messages_.size());
+  DCHECK_EQ(
+      static_cast<uint32>(ServiceWorkerMsg_ServiceWorkerRegistrationError::ID),
+      dispatcher_host->sent_messages_[0]->type());
+}
+
 }  // namespace content