Revert of Start EmbeddedWorker during registration - take 2

content/browser/service_worker/service_worker_context_unittest.cc

Index: content/browser/service_worker/service_worker_context_unittest.cc
diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc
index 43487bfe371c0c3e68180fbc17b99676845c7f69..56f52188664ca5c9a0eabf82b42d373fcf43332d 100644
--- a/content/browser/service_worker/service_worker_context_unittest.cc
+++ b/content/browser/service_worker/service_worker_context_unittest.cc
@@ -8,8 +8,6 @@
 #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/embedded_worker_test_helper.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"
@@ -52,22 +50,13 @@
 
   virtual void SetUp() OVERRIDE {
     context_.reset(new ServiceWorkerContextCore(base::FilePath(), NULL));
-    helper_.reset(new EmbeddedWorkerTestHelper(context_.get()));
-
-    render_process_id_ = 99;
-    helper_->SimulateCreateWorker(render_process_id_);
   }
 
-  virtual void TearDown() OVERRIDE {
-    helper_.reset();
-    context_.reset();
-  }
+  virtual void TearDown() OVERRIDE { context_.reset(); }
 
  protected:
   TestBrowserThreadBundle browser_thread_bundle_;
   scoped_ptr<ServiceWorkerContextCore> context_;
-  scoped_ptr<EmbeddedWorkerTestHelper> helper_;
-  int render_process_id_;
 };
 
 void RegistrationCallback(
@@ -83,15 +72,13 @@
   context_->RegisterServiceWorker(
       GURL("http://www.example.com/*"),
       GURL("http://www.example.com/service_worker.js"),
-      render_process_id_,
       MakeRegisteredCallback(&called, &registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(called);
+  ASSERT_TRUE(called);
 
-  EXPECT_EQ(1UL, helper_->ipc_sink()->message_count());
-  EXPECT_NE(-1L, registration_id);
+  ASSERT_NE(-1L, registration_id);
 }
 
 // Make sure registrations are cleaned up when they are unregistered.
@@ -103,7 +90,6 @@
   context_->RegisterServiceWorker(
       pattern,
       GURL("http://www.example.com/service_worker.js"),
-      render_process_id_,
       MakeRegisteredCallback(&called, &registration_id));
 
   ASSERT_FALSE(called);
@@ -111,8 +97,7 @@
   ASSERT_TRUE(called);
 
   called = false;
-  context_->UnregisterServiceWorker(
-      pattern, render_process_id_, MakeUnregisteredCallback(&called));
+  context_->UnregisterServiceWorker(pattern, MakeUnregisteredCallback(&called));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
@@ -129,7 +114,6 @@
   context_->RegisterServiceWorker(
       pattern,
       GURL("http://www.example.com/service_worker.js"),
-      render_process_id_,
       MakeRegisteredCallback(&called, &old_registration_id));
 
   ASSERT_FALSE(called);
@@ -141,7 +125,6 @@
   context_->RegisterServiceWorker(
       pattern,
       GURL("http://www.example.com/service_worker_new.js"),
-      render_process_id_,
       MakeRegisteredCallback(&called, &new_registration_id));
 
   ASSERT_FALSE(called);
@@ -162,7 +145,6 @@
   context_->RegisterServiceWorker(
       pattern,
       script_url,
-      render_process_id_,
       MakeRegisteredCallback(&called, &old_registration_id));
 
   ASSERT_FALSE(called);
@@ -174,7 +156,6 @@
   context_->RegisterServiceWorker(
       pattern,
       script_url,
-      render_process_id_,
       MakeRegisteredCallback(&called, &new_registration_id));
 
   ASSERT_FALSE(called);