Start EmbeddedWorker during registration - take 2

content/browser/service_worker/service_worker_context_unittest.cc

 // 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.
 
 #include "content/browser/service_worker/service_worker_context.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/browser_thread_impl.h"
+#include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
+#include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 void SaveResponseCallback(bool* called,
                           int64* store_result,
                           ServiceWorkerRegistrationStatus status,
                           int64 result) {
@@ skipping 18 matching lines @@
 
 }  // namespace
 
 class ServiceWorkerContextTest : public testing::Test {
  public:
   ServiceWorkerContextTest()
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   virtual void SetUp() OVERRIDE {
     context_.reset(new ServiceWorkerContextCore(base::FilePath(), NULL));
+
+    int provider_id = 123;
+    render_process_id_ = 99;
+    context_->embedded_worker_registry()->AddChildProcessSender(
+        render_process_id_, &sink_);
+    scoped_ptr<ServiceWorkerProviderHost> provider_host(
+        new ServiceWorkerProviderHost(render_process_id_, provider_id));
+    context_->AddProviderHost(provider_host.Pass());
+
+    provider_host_ = context_->GetProviderHost(render_process_id_, provider_id);
   }
 
-  virtual void TearDown() OVERRIDE { context_.reset(); }
+  virtual void TearDown() OVERRIDE {
+    context_.reset();
+    context_->embedded_worker_registry()->RemoveChildProcessSender(
+        provider_host_->process_id());
+    context_->RemoveProviderHost(provider_host_->process_id(),
+                                 provider_host_->provider_id());
+  }
+
+  int GetWorkerInstanceId() {
+    EXPECT_EQ(1U,
+              context_->embedded_worker_registry()->worker_instances().size());
+    return context_->embedded_worker_registry()
+        ->worker_instances()
+        .begin()
+        ->first;
+  }
 
  protected:
   TestBrowserThreadBundle browser_thread_bundle_;
+  IPC::TestSink sink_;
   scoped_ptr<ServiceWorkerContextCore> context_;
+  ServiceWorkerProviderHost* provider_host_;
+  int render_process_id_;
 };
 
 void RegistrationCallback(
     scoped_refptr<ServiceWorkerRegistration>* registration,
     const scoped_refptr<ServiceWorkerRegistration>& result) {
   *registration = result;
 }
 
 // Make sure basic registration is working.
 TEST_F(ServiceWorkerContextTest, Register) {
   int64 registration_id = -1L;
   bool called = false;
   context_->RegisterServiceWorker(
       GURL("http://www.example.com/*"),
       GURL("http://www.example.com/service_worker.js"),
+      provider_host_,
       MakeRegisteredCallback(&called, &registration_id));
 
+  LOG(ERROR) << "RunUntilIdle...";
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
-  ASSERT_TRUE(called);
 
-  ASSERT_NE(-1L, registration_id);
+  EXPECT_EQ(1UL, sink_.message_count());
+
+  LOG(ERROR) << "Claiming that OnWorkerStarted()";
+  context_->embedded_worker_registry()->OnWorkerStarted(
+      render_process_id_, -1, GetWorkerInstanceId());
+  EXPECT_TRUE(called);
+
+  EXPECT_NE(-1L, registration_id);
 }
 
 // Make sure registrations are cleaned up when they are unregistered.
 TEST_F(ServiceWorkerContextTest, Unregister) {
   GURL pattern("http://www.example.com/*");
 
   bool called = false;
   int64 registration_id = -1L;
   context_->RegisterServiceWorker(
       pattern,
       GURL("http://www.example.com/service_worker.js"),
+      provider_host_,
       MakeRegisteredCallback(&called, &registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 
   called = false;
-  context_->UnregisterServiceWorker(pattern, MakeUnregisteredCallback(&called));
+  context_->UnregisterServiceWorker(
+      pattern, provider_host_, MakeUnregisteredCallback(&called));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 }
 
 // Make sure that when a new registration replaces an existing
 // registration, that the old one is cleaned up.
 TEST_F(ServiceWorkerContextTest, RegisterNewScript) {
   GURL pattern("http://www.example.com/*");
 
   bool called = false;
   int64 old_registration_id = -1L;
   context_->RegisterServiceWorker(
       pattern,
       GURL("http://www.example.com/service_worker.js"),
+      provider_host_,
       MakeRegisteredCallback(&called, &old_registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 
   called = false;
   int64 new_registration_id = -1L;
   context_->RegisterServiceWorker(
       pattern,
       GURL("http://www.example.com/service_worker_new.js"),
+      provider_host_,
       MakeRegisteredCallback(&called, &new_registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 
   ASSERT_NE(old_registration_id, new_registration_id);
 }
 
 // Make sure that when registering a duplicate pattern+script_url
 // combination, that the same registration is used.
 TEST_F(ServiceWorkerContextTest, RegisterDuplicateScript) {
   GURL pattern("http://www.example.com/*");
   GURL script_url("http://www.example.com/service_worker.js");
 
   bool called = false;
   int64 old_registration_id = -1L;
   context_->RegisterServiceWorker(
       pattern,
       script_url,
+      provider_host_,
       MakeRegisteredCallback(&called, &old_registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 
   called = false;
   int64 new_registration_id = -1L;
   context_->RegisterServiceWorker(
       pattern,
       script_url,
+      provider_host_,
       MakeRegisteredCallback(&called, &new_registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 
   ASSERT_EQ(old_registration_id, new_registration_id);
 }
 
 }  // namespace content