WIP attempt to replace StartWorker/StopWorker IPCs with a new mojo EmbeddedWorker service.

content/browser/service_worker/service_worker_url_request_job_unittest.cc

Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 02d305e24451f55463926afc2a8f1a635e9f062b..416f78562161a424b6b02401fbf990d290ae1720 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -53,7 +53,6 @@ class ServiceWorkerURLRequestJobTest;
 
 namespace {
 
-const int kProcessID = 1;
 const int kProviderID = 100;
 const char kTestData[] = "Here is sample text for the blob.";
 
@@ -119,7 +118,7 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
   void SetUp() override {
     browser_context_.reset(new TestBrowserContext);
     InitializeResourceContext(browser_context_.get());
-    SetUpWithHelper(new EmbeddedWorkerTestHelper(base::FilePath(), kProcessID));
+    SetUpWithHelper(new EmbeddedWorkerTestHelper(base::FilePath()));
   }
 
   void SetUpWithHelper(EmbeddedWorkerTestHelper* helper,
@@ -163,10 +162,10 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
     }
 
     scoped_ptr<ServiceWorkerProviderHost> provider_host(
-        new ServiceWorkerProviderHost(kProcessID, MSG_ROUTING_NONE, kProviderID,
-                                      SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-                                      helper_->context()->AsWeakPtr(),
-                                      nullptr));
+        new ServiceWorkerProviderHost(
+            helper_->mock_render_process_id(), MSG_ROUTING_NONE, kProviderID,
+            SERVICE_WORKER_PROVIDER_FOR_WINDOW, helper_->context()->AsWeakPtr(),
+            nullptr));
     provider_host->SetDocumentUrl(GURL("http://example.com/"));
     registration_->SetActiveVersion(version_);
     provider_host->AssociateRegistration(registration_.get(),
@@ -249,15 +248,14 @@ TEST_F(ServiceWorkerURLRequestJobTest, Simple) {
 
 class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
  public:
-  ProviderDeleteHelper(int mock_render_process_id)
-      : EmbeddedWorkerTestHelper(base::FilePath(), mock_render_process_id) {}
+  ProviderDeleteHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {}
   ~ProviderDeleteHelper() override {}
 
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int request_id,
                     const ServiceWorkerFetchRequest& request) override {
-    context()->RemoveProviderHost(kProcessID, kProviderID);
+    context()->RemoveProviderHost(mock_render_process_id(), kProviderID);
     SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
         embedded_worker_id, request_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -275,7 +273,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, DeletedProviderHostOnFetchEvent) {
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   // Shouldn't crash if the ProviderHost is deleted prior to completion of
   // the fetch event.
-  SetUpWithHelper(new ProviderDeleteHelper(kProcessID));
+  SetUpWithHelper(new ProviderDeleteHelper());
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(200, "OK", std::string());
@@ -289,7 +287,8 @@ TEST_F(ServiceWorkerURLRequestJobTest, DeletedProviderHostBeforeFetchEvent) {
 
   request_->set_method("GET");
   request_->Start();
-  helper_->context()->RemoveProviderHost(kProcessID, kProviderID);
+  helper_->context()->RemoveProviderHost(helper_->mock_render_process_id(),
+                                         kProviderID);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(request_->status().is_success());
   EXPECT_EQ(500, request_->response_headers()->response_code());
@@ -301,10 +300,8 @@ TEST_F(ServiceWorkerURLRequestJobTest, DeletedProviderHostBeforeFetchEvent) {
 // Responds to fetch events with a blob.
 class BlobResponder : public EmbeddedWorkerTestHelper {
  public:
-  BlobResponder(int mock_render_process_id,
-                const std::string& blob_uuid,
-                uint64 blob_size)
-      : EmbeddedWorkerTestHelper(base::FilePath(), mock_render_process_id),
+  BlobResponder(const std::string& blob_uuid, uint64 blob_size)
+      : EmbeddedWorkerTestHelper(base::FilePath()),
         blob_uuid_(blob_uuid),
         blob_size_(blob_size) {}
   ~BlobResponder() override {}
@@ -340,15 +337,15 @@ TEST_F(ServiceWorkerURLRequestJobTest, BlobResponse) {
   }
   scoped_ptr<storage::BlobDataHandle> blob_handle =
       blob_storage_context->context()->AddFinishedBlob(blob_data_.get());
-  SetUpWithHelper(new BlobResponder(
-      kProcessID, blob_handle->uuid(), expected_response.size()));
+  SetUpWithHelper(
+      new BlobResponder(blob_handle->uuid(), expected_response.size()));
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(200, "OK", expected_response);
 }
 
 TEST_F(ServiceWorkerURLRequestJobTest, NonExistentBlobUUIDResponse) {
-  SetUpWithHelper(new BlobResponder(kProcessID, "blob-id:nothing-is-here", 0));
+  SetUpWithHelper(new BlobResponder("blob-id:nothing-is-here", 0));
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(500, "Service Worker Response Error", std::string());
 }
@@ -356,9 +353,8 @@ TEST_F(ServiceWorkerURLRequestJobTest, NonExistentBlobUUIDResponse) {
 // Responds to fetch events with a stream.
 class StreamResponder : public EmbeddedWorkerTestHelper {
  public:
-  StreamResponder(int mock_render_process_id, const GURL& stream_url)
-      : EmbeddedWorkerTestHelper(base::FilePath(), mock_render_process_id),
-        stream_url_(stream_url) {}
+  StreamResponder(const GURL& stream_url)
+      : EmbeddedWorkerTestHelper(base::FilePath()), stream_url_(stream_url) {}
   ~StreamResponder() override {}
 
  protected:
@@ -387,7 +383,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse) {
           browser_context_->GetResourceContext());
   scoped_refptr<Stream> stream =
       new Stream(stream_context->registry(), nullptr, stream_url);
-  SetUpWithHelper(new StreamResponder(kProcessID, stream_url));
+  SetUpWithHelper(new StreamResponder(stream_url));
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
       GURL("http://example.com/foo.html"), net::DEFAULT_PRIORITY,
@@ -421,7 +417,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_DelayedRegistration) {
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
           browser_context_->GetResourceContext());
-  SetUpWithHelper(new StreamResponder(kProcessID, stream_url));
+  SetUpWithHelper(new StreamResponder(stream_url));
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
@@ -468,7 +464,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_QuickFinalize) {
     stream->AddData(kTestData, sizeof(kTestData) - 1);
   }
   stream->Finalize();
-  SetUpWithHelper(new StreamResponder(kProcessID, stream_url));
+  SetUpWithHelper(new StreamResponder(stream_url));
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
@@ -497,7 +493,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_Flush) {
           browser_context_->GetResourceContext());
   scoped_refptr<Stream> stream =
       new Stream(stream_context->registry(), nullptr, stream_url);
-  SetUpWithHelper(new StreamResponder(kProcessID, stream_url));
+  SetUpWithHelper(new StreamResponder(stream_url));
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
@@ -533,7 +529,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponseAndCancel) {
       new Stream(stream_context->registry(), nullptr, stream_url);
   ASSERT_EQ(stream.get(),
             stream_context->registry()->GetStream(stream_url).get());
-  SetUpWithHelper(new StreamResponder(kProcessID, stream_url));
+  SetUpWithHelper(new StreamResponder(stream_url));
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
@@ -571,7 +567,7 @@ TEST_F(ServiceWorkerURLRequestJobTest,
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
           browser_context_->GetResourceContext());
-  SetUpWithHelper(new StreamResponder(kProcessID, stream_url));
+  SetUpWithHelper(new StreamResponder(stream_url));
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
@@ -600,8 +596,7 @@ TEST_F(ServiceWorkerURLRequestJobTest,
 // Helper to simulate failing to dispatch a fetch event to a worker.
 class FailFetchHelper : public EmbeddedWorkerTestHelper {
  public:
-  FailFetchHelper(int mock_render_process_id)
-      : EmbeddedWorkerTestHelper(base::FilePath(), mock_render_process_id) {}
+  FailFetchHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {}
   ~FailFetchHelper() override {}
 
  protected:
@@ -616,7 +611,7 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
 };
 
 TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
-  SetUpWithHelper(new FailFetchHelper(kProcessID));
+  SetUpWithHelper(new FailFetchHelper());
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
@@ -631,8 +626,8 @@ TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
   EXPECT_EQ(200, request_->GetResponseCode());
   EXPECT_EQ("PASS", url_request_delegate_.response_data());
   EXPECT_FALSE(HasInflightRequests());
-  ServiceWorkerProviderHost* host =
-      helper_->context()->GetProviderHost(kProcessID, kProviderID);
+  ServiceWorkerProviderHost* host = helper_->context()->GetProviderHost(
+      helper_->mock_render_process_id(), kProviderID);
   ASSERT_TRUE(host);
   EXPECT_EQ(host->controlling_version(), nullptr);
 }
@@ -640,8 +635,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
 // TODO(horo): Remove this test when crbug.com/485900 is fixed.
 TEST_F(ServiceWorkerURLRequestJobTest, MainScriptHTTPResponseInfoNotSet) {
   // Shouldn't crash if MainScriptHttpResponseInfo is not set.
-  SetUpWithHelper(new EmbeddedWorkerTestHelper(base::FilePath(), kProcessID),
-                  false);
+  SetUpWithHelper(new EmbeddedWorkerTestHelper(base::FilePath()), false);
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
       GURL("http://example.com/foo.html"), net::DEFAULT_PRIORITY,