Index: content/browser/service_worker/service_worker_job_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc |
index 5082924d8091f32ff2464618d22c269876a3b34f..5ea9d11a0724baac9a6ef88b1157dee414d3094b 100644 |
--- a/content/browser/service_worker/service_worker_job_unittest.cc |
+++ b/content/browser/service_worker/service_worker_job_unittest.cc |
@@ -1645,16 +1645,20 @@ TEST_P(ServiceWorkerJobTestP, Update_PauseAfterDownload) { |
UpdateJobTestHelper* update_helper = new UpdateJobTestHelper; |
helper_.reset(update_helper); |
IPC::TestSink* sink = update_helper->ipc_sink(); |
- std::vector<CheckPauseAfterDownloadEmbeddedWorkerInstanceClient*> clients = { |
- helper_->CreateAndRegisterMockInstanceClient< |
- CheckPauseAfterDownloadEmbeddedWorkerInstanceClient>( |
- helper_->AsWeakPtr()), |
- helper_->CreateAndRegisterMockInstanceClient< |
- CheckPauseAfterDownloadEmbeddedWorkerInstanceClient>( |
- helper_->AsWeakPtr())}; |
+ |
+ std::vector<CheckPauseAfterDownloadEmbeddedWorkerInstanceClient*> clients; |
+ if (is_mojo_enabled()) { |
horo
2016/10/20 02:25:50
This change is already in https://codereview.chrom
shimazu
2016/10/20 08:36:34
Done.
|
+ clients.push_back(helper_->CreateAndRegisterMockInstanceClient< |
+ CheckPauseAfterDownloadEmbeddedWorkerInstanceClient>( |
+ helper_->AsWeakPtr())); |
+ clients.push_back(helper_->CreateAndRegisterMockInstanceClient< |
+ CheckPauseAfterDownloadEmbeddedWorkerInstanceClient>( |
+ helper_->AsWeakPtr())); |
+ } |
// The initial version should not pause after download. |
- clients[0]->set_next_pause_after_download(false); |
+ if (is_mojo_enabled()) |
+ clients[0]->set_next_pause_after_download(false); |
scoped_refptr<ServiceWorkerRegistration> registration = |
update_helper->SetupInitialRegistration(kNewVersionOrigin); |
if (is_mojo_enabled()) { |
@@ -1671,7 +1675,8 @@ TEST_P(ServiceWorkerJobTestP, Update_PauseAfterDownload) { |
} |
// The updated version should pause after download. |
- clients[1]->set_next_pause_after_download(true); |
+ if (is_mojo_enabled()) |
+ clients[1]->set_next_pause_after_download(true); |
registration->AddListener(update_helper); |
registration->active_version()->StartUpdate(); |
base::RunLoop().RunUntilIdle(); |