ServiceWorker: Mojofication of EWInstance::StopWorker

content/browser/service_worker/embedded_worker_instance_mojo_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/embedded_worker_instance.h"
 
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_status.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_context_wrapper.h"
 #include "content/common/service_worker/embedded_worker.mojom.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using ::testing::_;
 using ::testing::Eq;
 using ::testing::Field;
+using ::testing::Invoke;
 using ::testing::Pointee;
+using ::testing::Return;
 
 namespace content {
 
 namespace {
 
+void NoOpStatusCallback(ServiceWorkerStatusCode code) {}
+
 void SaveStatusAndCall(ServiceWorkerStatusCode* out,
                        const base::Closure& callback,
                        ServiceWorkerStatusCode status) {
   *out = status;
   callback.Run();
 }
 
 std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params>
 CreateStartParams(int version_id, const GURL& scope, const GURL& script_url) {
   std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
       new EmbeddedWorkerMsg_StartWorker_Params);
   params->service_worker_version_id = version_id;
   params->scope = scope;
   params->script_url = script_url;
   params->pause_after_download = false;
   return params;
 }
 
 bool IsMojoForServiceWorkerEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kMojoServiceWorker);
 }
 
 }  // namespace
 
-class EmbeddedWorkerInstanceTest : public testing::Test,
-                                   public EmbeddedWorkerInstance::Listener {
+class MojoEmbeddedWorkerInstanceTest : public testing::Test,

[horo, 2016/09/05 08:05:57]

You can use TEST_P instead of duplicating tests.
See CacheStorageCacheTestP for example.

[shimazu, 2016/09/06 08:53:59]

I didn't know that. Tried it.

+                                       public EmbeddedWorkerInstance::Listener {
  protected:
-  EmbeddedWorkerInstanceTest()
+  MojoEmbeddedWorkerInstanceTest()
       : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   enum EventType {
     PROCESS_ALLOCATED,
     START_WORKER_MESSAGE_SENT,
     STARTED,
     STOPPED,
     DETACHED,
   };
 
@@ skipping 17 matching lines @@
   void OnStopped(EmbeddedWorkerStatus old_status) override {
     RecordEvent(STOPPED, old_status);
   }
   void OnDetached(EmbeddedWorkerStatus old_status) override {
     RecordEvent(DETACHED, old_status);
   }
 
   bool OnMessageReceived(const IPC::Message& message) override { return false; }
 
   void SetUp() override {
+    base::CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kMojoServiceWorker);
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
   }
 
   void TearDown() override { helper_.reset(); }
 
   ServiceWorkerStatusCode StartWorker(EmbeddedWorkerInstance* worker,
-                                      int id, const GURL& pattern,
+                                      int id,
+                                      const GURL& pattern,
                                       const GURL& url) {
     ServiceWorkerStatusCode status;
     base::RunLoop run_loop;
     std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params =
         CreateStartParams(id, pattern, url);
     worker->Start(std::move(params), base::Bind(&SaveStatusAndCall, &status,
                                                 run_loop.QuitClosure()));
     run_loop.Run();
     return status;
   }
 
   ServiceWorkerContextCore* context() { return helper_->context(); }
 
   EmbeddedWorkerRegistry* embedded_worker_registry() {
     DCHECK(context());
     return context()->embedded_worker_registry();
   }
 
   IPC::TestSink* ipc_sink() { return helper_->ipc_sink(); }
 
+  std::vector<std::unique_ptr<
+      EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient>>*
+  mock_instance_clients() {
+    return helper_->mock_instance_clients();
+  }
+
   TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   std::vector<EventLog> events_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstanceTest);
-};
-
-class MojoEmbeddedWorkerInstanceTest : public EmbeddedWorkerInstanceTest {
- protected:
-  void SetUp() override {
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kMojoServiceWorker);
-    EmbeddedWorkerInstanceTest::SetUp();
-  }
-
-  std::vector<std::unique_ptr<
-      EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient>>*
-  mock_instance_clients() {
-    return helper_->mock_instance_clients();
-  }
+  DISALLOW_COPY_AND_ASSIGN(MojoEmbeddedWorkerInstanceTest);
 };
 
 // A helper to simulate the start worker sequence is stalled in a worker
 // process.
 class StalledInStartWorkerHelper : public EmbeddedWorkerTestHelper {
  public:
   StalledInStartWorkerHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {}
   ~StalledInStartWorkerHelper() override{};
 
   void OnStartWorker(int embedded_worker_id,
@@ skipping 11 matching lines @@
   }
 
   void set_force_stall_in_start(bool force_stall_in_start) {
     force_stall_in_start_ = force_stall_in_start;
   }
 
  private:
   bool force_stall_in_start_ = true;
 };
 
-class FailToSendIPCHelper : public EmbeddedWorkerTestHelper {
- public:
-  FailToSendIPCHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {}
-  ~FailToSendIPCHelper() override {}
-
-  bool Send(IPC::Message* message) override {
-    delete message;
-    return false;
-  }
-};
-
-TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
-  std::unique_ptr<EmbeddedWorkerInstance> worker =
-      embedded_worker_registry()->CreateWorker();
-  EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
-
-  const int64_t service_worker_version_id = 55L;
-  const GURL pattern("http://example.com/");
-  const GURL url("http://example.com/worker.js");
-
-  // Simulate adding one process to the pattern.
-  helper_->SimulateAddProcessToPattern(pattern,
-                                       helper_->mock_render_process_id());
-
-  // Start should succeed.
-  ServiceWorkerStatusCode status;
-  base::RunLoop run_loop;
-  std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params =
-      CreateStartParams(service_worker_version_id, pattern, url);
-  worker->Start(std::move(params), base::Bind(&SaveStatusAndCall, &status,
-                                              run_loop.QuitClosure()));
-  EXPECT_EQ(EmbeddedWorkerStatus::STARTING, worker->status());
-  run_loop.Run();
-  EXPECT_EQ(SERVICE_WORKER_OK, status);
-
-  // The 'WorkerStarted' message should have been sent by
-  // EmbeddedWorkerTestHelper.
-  EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, worker->status());
-  EXPECT_EQ(helper_->mock_render_process_id(), worker->process_id());
-
-  // Stop the worker.
-  EXPECT_EQ(SERVICE_WORKER_OK, worker->Stop());
-  EXPECT_EQ(EmbeddedWorkerStatus::STOPPING, worker->status());
-  base::RunLoop().RunUntilIdle();
-
-  // The 'WorkerStopped' message should have been sent by
-  // EmbeddedWorkerTestHelper.
-  EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
-
-  // Verify that we've sent two messages to start and terminate the worker.
-  ASSERT_TRUE(
-      ipc_sink()->GetUniqueMessageMatching(EmbeddedWorkerMsg_StartWorker::ID));
-  ASSERT_TRUE(ipc_sink()->GetUniqueMessageMatching(
-      EmbeddedWorkerMsg_StopWorker::ID));
-}
-
 TEST_F(MojoEmbeddedWorkerInstanceTest, StartAndStop) {
   using mojom::EmbeddedWorkerStartWorkerParams;
 
   ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
 
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 
   const int64_t service_worker_version_id = 55L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   // Simulate adding one process to the pattern.
   helper_->SimulateAddProcessToPattern(pattern,
                                        helper_->mock_render_process_id());
 
-  // Check if StartWorker will be called via mojo IPC.
+  // Check if StartWorker/StopWorker will be called via mojo IPC.
   helper_->PrepareMockInstanceClients(1);
   ASSERT_EQ(mock_instance_clients()->size(), 1UL);
   EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient* instance_client =
       mock_instance_clients()->at(0).get();
   EXPECT_CALL(
       *instance_client,
       MockStartWorker(AllOf(
           Pointee(
               Field(&EmbeddedWorkerStartWorkerParams::service_worker_version_id,
                     Eq(service_worker_version_id))),
           Pointee(Field(&EmbeddedWorkerStartWorkerParams::scope, Eq(pattern))),
           Pointee(
               Field(&EmbeddedWorkerStartWorkerParams::script_url, Eq(url))))))
       .Times(1);
+  EXPECT_CALL(*instance_client, MockStopWorker(_)).Times(1);
 
   // Start should succeed.
   ServiceWorkerStatusCode status;
   base::RunLoop run_loop;
   std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params =
       CreateStartParams(service_worker_version_id, pattern, url);
   worker->Start(std::move(params), base::Bind(&SaveStatusAndCall, &status,
                                               run_loop.QuitClosure()));
   EXPECT_EQ(EmbeddedWorkerStatus::STARTING, worker->status());
   run_loop.Run();
   EXPECT_EQ(SERVICE_WORKER_OK, status);
 
   // The 'WorkerStarted' message should have been sent by
   // EmbeddedWorkerTestHelper.
   EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, worker->status());
   EXPECT_EQ(helper_->mock_render_process_id(), worker->process_id());
 
   // Stop the worker.
   EXPECT_EQ(SERVICE_WORKER_OK, worker->Stop());
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPING, worker->status());
   base::RunLoop().RunUntilIdle();
 
-  // The 'WorkerStopped' message should have been sent by
+  // Callback passed by mojo IPC should have been called by
   // EmbeddedWorkerTestHelper.
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
-
-  // Ckeck if StopWorker has been sent via chromium IPC.
-  ASSERT_TRUE(
-      ipc_sink()->GetUniqueMessageMatching(EmbeddedWorkerMsg_StopWorker::ID));
 }
 
 // Test that a worker that failed twice will use a new render process
 // on the next attempt.
-TEST_F(EmbeddedWorkerInstanceTest, ForceNewProcess) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, ForceNewProcess) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 
   const int64_t service_worker_version_id = 55L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   // Simulate adding one process to the pattern.
   helper_->SimulateAddProcessToPattern(pattern,
@@ skipping 43 matching lines @@
     EXPECT_EQ(SERVICE_WORKER_OK, status);
 
     EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, worker->status());
     // The worker should be using the new render process.
     EXPECT_EQ(helper_->new_render_process_id(), worker->process_id());
     EXPECT_EQ(SERVICE_WORKER_OK, worker->Stop());
     base::RunLoop().RunUntilIdle();
   }
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, StopWhenDevToolsAttached) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, StopWhenDevToolsAttached) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 
   const int64_t service_worker_version_id = 55L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   // Simulate adding one process to the pattern.
   helper_->SimulateAddProcessToPattern(pattern,
@@ skipping 26 matching lines @@
 
   // Calling Stop() actually stops the worker regardless of whether devtools
   // is attached or not.
   EXPECT_EQ(SERVICE_WORKER_OK, worker->Stop());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 }
 
 // Test that the removal of a worker from the registry doesn't remove
 // other workers in the same process.
-TEST_F(EmbeddedWorkerInstanceTest, RemoveWorkerInSharedProcess) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, RemoveWorkerInSharedProcess) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   std::unique_ptr<EmbeddedWorkerInstance> worker1 =
       embedded_worker_registry()->CreateWorker();
   std::unique_ptr<EmbeddedWorkerInstance> worker2 =
       embedded_worker_registry()->CreateWorker();
 
   const int64_t version_id1 = 55L;
   const int64_t version_id2 = 56L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
   int process_id = helper_->mock_render_process_id();
@@ skipping 34 matching lines @@
   // Only worker1 should be removed from the registry's process_map.
   EmbeddedWorkerRegistry* registry =
       helper_->context()->embedded_worker_registry();
   EXPECT_EQ(0UL, registry->worker_process_map_[process_id].count(worker1_id));
   EXPECT_EQ(1UL, registry->worker_process_map_[process_id].count(
                      worker2->embedded_worker_id()));
 
   worker2->Stop();
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, DetachDuringProcessAllocation) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, DetachDuringProcessAllocation) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   const int64_t version_id = 55L;
   const GURL scope("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   worker->AddListener(this);
 
   // Run the start worker sequence and detach during process allocation.
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_MAX_VALUE;
@@ skipping 10 matching lines @@
   // The start callback should not be aborted by detach (see a comment on the
   // dtor of EmbeddedWorkerInstance::StartTask).
   EXPECT_EQ(SERVICE_WORKER_ERROR_MAX_VALUE, status);
 
   // "PROCESS_ALLOCATED" event should not be recorded.
   ASSERT_EQ(1u, events_.size());
   EXPECT_EQ(DETACHED, events_[0].type);
   EXPECT_EQ(EmbeddedWorkerStatus::STARTING, events_[0].status);
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, DetachAfterSendingStartWorkerMessage) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, DetachAfterSendingStartWorkerMessage) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   const int64_t version_id = 55L;
   const GURL scope("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   helper_.reset(new StalledInStartWorkerHelper());
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   worker->AddListener(this);
 
   // Run the start worker sequence until a start worker message is sent.
@@ skipping 18 matching lines @@
   // The start callback should not be aborted by detach (see a comment on the
   // dtor of EmbeddedWorkerInstance::StartTask).
   EXPECT_EQ(SERVICE_WORKER_ERROR_MAX_VALUE, status);
 
   // "STARTED" event should not be recorded.
   ASSERT_EQ(1u, events_.size());
   EXPECT_EQ(DETACHED, events_[0].type);
   EXPECT_EQ(EmbeddedWorkerStatus::STARTING, events_[0].status);
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, StopDuringProcessAllocation) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, StopDuringProcessAllocation) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   const int64_t version_id = 55L;
   const GURL scope("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   worker->AddListener(this);
 
   // Stop the start worker sequence before a process is allocated.
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_MAX_VALUE;
 
   std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
       CreateStartParams(version_id, scope, url));
   worker->Start(std::move(params), base::Bind(&SaveStatusAndCall, &status,
                                               base::Bind(&base::DoNothing)));
   worker->Stop();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
   EXPECT_EQ(ChildProcessHost::kInvalidUniqueID, worker->process_id());
 
   // The start callback should not be aborted by stop (see a comment on the dtor
   // of EmbeddedWorkerInstance::StartTask).
   EXPECT_EQ(SERVICE_WORKER_ERROR_MAX_VALUE, status);
 
   // "PROCESS_ALLOCATED" event should not be recorded.
   ASSERT_EQ(1u, events_.size());
   EXPECT_EQ(DETACHED, events_[0].type);
-  EXPECT_EQ(EmbeddedWorkerStatus::STARTING, events_[0].status);
   events_.clear();
 
   // Restart the worker.
   status = SERVICE_WORKER_ERROR_MAX_VALUE;
   std::unique_ptr<base::RunLoop> run_loop(new base::RunLoop);
   params = CreateStartParams(version_id, scope, url);
   worker->Start(std::move(params), base::Bind(&SaveStatusAndCall, &status,
                                               run_loop->QuitClosure()));
   run_loop->Run();
 
   EXPECT_EQ(SERVICE_WORKER_OK, status);
   ASSERT_EQ(3u, events_.size());
   EXPECT_EQ(PROCESS_ALLOCATED, events_[0].type);
   EXPECT_EQ(START_WORKER_MESSAGE_SENT, events_[1].type);
   EXPECT_EQ(STARTED, events_[2].type);
 
   // Tear down the worker.
   worker->Stop();
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, StopDuringPausedAfterDownload) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, StopDuringPausedAfterDownload) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   const int64_t version_id = 55L;
   const GURL scope("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   worker->AddListener(this);
 
   // Run the start worker sequence until pause after download.
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_MAX_VALUE;
@@ skipping 10 matching lines @@
   worker->Stop();
   worker->ResumeAfterDownload();
   base::RunLoop().RunUntilIdle();
 
   // The resume after download message should not have been sent.
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
   EXPECT_FALSE(ipc_sink()->GetFirstMessageMatching(
       EmbeddedWorkerMsg_ResumeAfterDownload::ID));
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, StopAfterSendingStartWorkerMessage) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, StopAfterSendingStartWorkerMessage) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   const int64_t version_id = 55L;
   const GURL scope("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   helper_.reset(new StalledInStartWorkerHelper);
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   worker->AddListener(this);
 
   // Run the start worker sequence until a start worker message is sent.
@@ skipping 40 matching lines @@
   EXPECT_EQ(SERVICE_WORKER_OK, status);
   ASSERT_EQ(3u, events_.size());
   EXPECT_EQ(PROCESS_ALLOCATED, events_[0].type);
   EXPECT_EQ(START_WORKER_MESSAGE_SENT, events_[1].type);
   EXPECT_EQ(STARTED, events_[2].type);
 
   // Tear down the worker.
   worker->Stop();
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, Detach) {
+TEST_F(MojoEmbeddedWorkerInstanceTest, Detach) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
   const int64_t version_id = 55L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   helper_->SimulateAddProcessToPattern(pattern,
                                        helper_->mock_render_process_id());
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
   worker->AddListener(this);
 
@@ skipping 10 matching lines @@
   worker->Detach();
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 
   // Send the registry a message from the detached worker. Nothing should
   // happen.
   embedded_worker_registry()->OnWorkerStarted(process_id,
                                               worker->embedded_worker_id());
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
 }
 
-// Test for when sending the start IPC failed.
-TEST_F(EmbeddedWorkerInstanceTest, FailToSendStartIPC) {
-  helper_.reset(new FailToSendIPCHelper());
+// Test for when sending the start IPC failed: sudden shutdown of remote process
+TEST_F(MojoEmbeddedWorkerInstanceTest, RemoveRemoteInterface) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
 
   const int64_t version_id = 55L;
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
+  // Let StartWorker fail; binding is discarded in the middle of IPC
+  helper_->PrepareMockInstanceClients(1);
+  ASSERT_EQ(mock_instance_clients()->size(), 1UL);
+  EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient* instance_client =
+      mock_instance_clients()->at(0).get();
+  EXPECT_CALL(*instance_client, MockStartWorker(_))
+      .WillOnce(WithoutArgs(
+          Invoke([this]() { helper_->mock_instance_clients()->clear(); })));
+
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   helper_->SimulateAddProcessToPattern(pattern,
                                        helper_->mock_render_process_id());
-  ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
   worker->AddListener(this);
 
   // Attempt to start the worker.
-  base::RunLoop run_loop;
   std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
       CreateStartParams(version_id, pattern, url));
-  worker->Start(std::move(params), base::Bind(&SaveStatusAndCall, &status,
-                                              run_loop.QuitClosure()));
-  run_loop.Run();
+  worker->Start(std::move(params), base::Bind(&NoOpStatusCallback));
+  base::RunLoop().RunUntilIdle();
 
-  // The callback should have run, and we should have got an OnStopped message.
-  EXPECT_EQ(SERVICE_WORKER_ERROR_IPC_FAILED, status);
-  ASSERT_EQ(2u, events_.size());
+  // Worker should handle the sudden shutdown as detach.
+  ASSERT_EQ(3u, events_.size());
   EXPECT_EQ(PROCESS_ALLOCATED, events_[0].type);
-  EXPECT_EQ(STOPPED, events_[1].type);
-  EXPECT_EQ(EmbeddedWorkerStatus::STARTING, events_[1].status);
+  EXPECT_EQ(START_WORKER_MESSAGE_SENT, events_[1].type);
+  EXPECT_EQ(DETACHED, events_[2].type);
+  EXPECT_EQ(EmbeddedWorkerStatus::STARTING, events_[2].status);
+}
+
+// Test for when sending the start IPC failed: connection failure
+TEST_F(MojoEmbeddedWorkerInstanceTest, FailToSendStartIPC) {
+  ASSERT_TRUE(IsMojoForServiceWorkerEnabled());
+
+  const int64_t version_id = 55L;
+  const GURL pattern("http://example.com/");
+  const GURL url("http://example.com/worker.js");
+
+  // Let StartWorker fail; mojo IPC fails to connect to a remote interface.
+  helper_->PrepareMockInstanceClients(1);
+  ASSERT_EQ(mock_instance_clients()->size(), 1UL);
+  mock_instance_clients()->at(0).reset();
+
+  std::unique_ptr<EmbeddedWorkerInstance> worker =
+      embedded_worker_registry()->CreateWorker();
+  helper_->SimulateAddProcessToPattern(pattern,
+                                       helper_->mock_render_process_id());
+  worker->AddListener(this);
+
+  // Attempt to start the worker.
+  std::unique_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
+      CreateStartParams(version_id, pattern, url));
+  worker->Start(std::move(params), base::Bind(&NoOpStatusCallback));
+  base::RunLoop().RunUntilIdle();
+
+  // Worker should handle the failure of binding as detach.
+  ASSERT_EQ(3u, events_.size());
+  EXPECT_EQ(PROCESS_ALLOCATED, events_[0].type);
+  EXPECT_EQ(START_WORKER_MESSAGE_SENT, events_[1].type);
+  EXPECT_EQ(DETACHED, events_[2].type);
+  EXPECT_EQ(EmbeddedWorkerStatus::STARTING, events_[2].status);
 }
 
 }  // namespace content