Index: content/browser/service_worker/service_worker_version_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc |
index b8a5e89414c9f719780b45165f1a2d6ae52c2485..d5746288f20f56312eb7000e45953f33db8dbe49 100644 |
--- a/content/browser/service_worker/service_worker_version_unittest.cc |
+++ b/content/browser/service_worker/service_worker_version_unittest.cc |
@@ -398,32 +398,6 @@ class ServiceWorkerStallInStoppingTest : public ServiceWorkerVersionTestP { |
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerStallInStoppingTest); |
}; |
-class MessageReceiverMojoTestService : public MessageReceiver { |
- public: |
- MessageReceiverMojoTestService() : MessageReceiver() {} |
- ~MessageReceiverMojoTestService() override {} |
- |
- void OnSetupMojo(int thread_id, |
- service_manager::InterfaceRegistry* registry) override { |
- registry->AddInterface(base::Bind(&TestServiceImpl::Create)); |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(MessageReceiverMojoTestService); |
-}; |
- |
-class ServiceWorkerVersionWithMojoTest : public ServiceWorkerVersionTestP { |
- protected: |
- ServiceWorkerVersionWithMojoTest() : ServiceWorkerVersionTestP() {} |
- |
- std::unique_ptr<MessageReceiver> GetMessageReceiver() override { |
- return base::MakeUnique<MessageReceiverMojoTestService>(); |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(ServiceWorkerVersionWithMojoTest); |
-}; |
- |
TEST_P(ServiceWorkerVersionTestP, ConcurrentStartAndStop) { |
// Call StartWorker() multiple times. |
ServiceWorkerStatusCode status1 = SERVICE_WORKER_ERROR_FAILED; |
@@ -1220,58 +1194,6 @@ TEST_P(ServiceWorkerVersionTestP, RendererCrashDuringEvent) { |
base::Time::Now())); |
} |
-TEST_P(ServiceWorkerVersionWithMojoTest, MojoService) { |
- ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_NETWORK; // dummy value |
- |
- version_->SetStatus(ServiceWorkerVersion::ACTIVATED); |
- version_->StartWorker(ServiceWorkerMetrics::EventType::SYNC, |
- CreateReceiverOnCurrentThread(&status)); |
- base::RunLoop().RunUntilIdle(); |
- EXPECT_EQ(SERVICE_WORKER_OK, status); |
- EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version_->running_status()); |
- |
- scoped_refptr<MessageLoopRunner> runner(new MessageLoopRunner); |
- int request_id = version_->StartRequest( |
- ServiceWorkerMetrics::EventType::SYNC, |
- CreateReceiverOnCurrentThread(&status, runner->QuitClosure())); |
- base::WeakPtr<mojom::TestService> service = |
- version_->GetMojoServiceForRequest<mojom::TestService>(request_id); |
- service->DoSomething(runner->QuitClosure()); |
- runner->Run(); |
- |
- // Mojo service does exist in worker, so error callback should not have been |
- // called and FinishRequest should return true. |
- EXPECT_EQ(SERVICE_WORKER_OK, status); |
- EXPECT_TRUE(version_->FinishRequest(request_id, true /* was_handled */, |
- base::Time::Now())); |
-} |
- |
-TEST_P(ServiceWorkerVersionTestP, NonExistentMojoService) { |
- ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_NETWORK; // dummy value |
- |
- version_->SetStatus(ServiceWorkerVersion::ACTIVATED); |
- version_->StartWorker(ServiceWorkerMetrics::EventType::SYNC, |
- CreateReceiverOnCurrentThread(&status)); |
- base::RunLoop().RunUntilIdle(); |
- EXPECT_EQ(SERVICE_WORKER_OK, status); |
- EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version_->running_status()); |
- |
- scoped_refptr<MessageLoopRunner> runner(new MessageLoopRunner); |
- int request_id = version_->StartRequest( |
- ServiceWorkerMetrics::EventType::SYNC, |
- CreateReceiverOnCurrentThread(&status, runner->QuitClosure())); |
- base::WeakPtr<mojom::TestService> service = |
- version_->GetMojoServiceForRequest<mojom::TestService>(request_id); |
- service->DoSomething(runner->QuitClosure()); |
- runner->Run(); |
- |
- // Mojo service doesn't exist in worker, so error callback should have been |
- // called and FinishRequest should return false. |
- EXPECT_EQ(SERVICE_WORKER_ERROR_FAILED, status); |
- EXPECT_FALSE(version_->FinishRequest(request_id, true /* was_handled */, |
- base::Time::Now())); |
-} |
- |
TEST_P(ServiceWorkerVersionTestP, DispatchEvent) { |
ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_NETWORK; // dummy value |
@@ -1787,8 +1709,4 @@ INSTANTIATE_TEST_CASE_P(ServiceWorkerNavigationHintUMATest, |
INSTANTIATE_TEST_CASE_P(ServiceWorkerStallInStoppingTest, |
ServiceWorkerStallInStoppingTest, |
testing::Bool()); |
-INSTANTIATE_TEST_CASE_P(ServiceWorkerVersionWithMojoTest, |
- ServiceWorkerVersionWithMojoTest, |
- testing::Bool()); |
- |
} // namespace content |