OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/service_worker/embedded_worker_test_helper.h" | 5 #include "content/browser/service_worker/embedded_worker_test_helper.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/atomic_sequence_num.h" | 13 #include "base/atomic_sequence_num.h" |
14 #include "base/bind.h" | 14 #include "base/bind.h" |
15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
| 16 #include "base/message_loop/message_loop.h" |
| 17 #include "base/run_loop.h" |
16 #include "base/threading/thread_task_runner_handle.h" | 18 #include "base/threading/thread_task_runner_handle.h" |
17 #include "base/time/time.h" | 19 #include "base/time/time.h" |
18 #include "content/browser/service_worker/embedded_worker_instance.h" | 20 #include "content/browser/service_worker/embedded_worker_instance.h" |
19 #include "content/browser/service_worker/embedded_worker_registry.h" | 21 #include "content/browser/service_worker/embedded_worker_registry.h" |
20 #include "content/browser/service_worker/embedded_worker_status.h" | 22 #include "content/browser/service_worker/embedded_worker_status.h" |
21 #include "content/browser/service_worker/service_worker_context_core.h" | 23 #include "content/browser/service_worker/service_worker_context_core.h" |
22 #include "content/browser/service_worker/service_worker_context_wrapper.h" | 24 #include "content/browser/service_worker/service_worker_context_wrapper.h" |
23 #include "content/browser/service_worker/service_worker_dispatcher_host.h" | 25 #include "content/browser/service_worker/service_worker_dispatcher_host.h" |
| 26 #include "content/browser/service_worker/service_worker_test_utils.h" |
24 #include "content/common/background_fetch/background_fetch_types.h" | 27 #include "content/common/background_fetch/background_fetch_types.h" |
25 #include "content/common/service_worker/embedded_worker_messages.h" | 28 #include "content/common/service_worker/embedded_worker_messages.h" |
26 #include "content/common/service_worker/embedded_worker_start_params.h" | 29 #include "content/common/service_worker/embedded_worker_start_params.h" |
27 #include "content/common/service_worker/service_worker_messages.h" | 30 #include "content/common/service_worker/service_worker_messages.h" |
28 #include "content/common/service_worker/service_worker_utils.h" | 31 #include "content/common/service_worker/service_worker_utils.h" |
29 #include "content/public/common/push_event_payload.h" | 32 #include "content/public/common/push_event_payload.h" |
30 #include "content/public/test/mock_render_process_host.h" | 33 #include "content/public/test/mock_render_process_host.h" |
31 #include "content/public/test/test_browser_context.h" | 34 #include "content/public/test/test_browser_context.h" |
32 #include "mojo/public/cpp/bindings/interface_request.h" | 35 #include "mojo/public/cpp/bindings/interface_request.h" |
33 #include "mojo/public/cpp/bindings/strong_binding.h" | 36 #include "mojo/public/cpp/bindings/strong_binding.h" |
(...skipping 18 matching lines...) Expand all Loading... |
52 | 55 |
53 protected: | 56 protected: |
54 ~MockServiceWorkerDispatcherHost() override {} | 57 ~MockServiceWorkerDispatcherHost() override {} |
55 | 58 |
56 private: | 59 private: |
57 IPC::Sender* sender_; | 60 IPC::Sender* sender_; |
58 | 61 |
59 DISALLOW_COPY_AND_ASSIGN(MockServiceWorkerDispatcherHost); | 62 DISALLOW_COPY_AND_ASSIGN(MockServiceWorkerDispatcherHost); |
60 }; | 63 }; |
61 | 64 |
| 65 void NestedLoopRunUntilIdle() { |
| 66 base::MessageLoop::ScopedNestableTaskAllower nestable_allower( |
| 67 base::MessageLoop::current()); |
| 68 base::RunLoop().RunUntilIdle(); |
| 69 } |
| 70 |
62 } // namespace | 71 } // namespace |
63 | 72 |
64 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient:: | 73 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient:: |
65 MockEmbeddedWorkerInstanceClient( | 74 MockEmbeddedWorkerInstanceClient( |
66 base::WeakPtr<EmbeddedWorkerTestHelper> helper) | 75 base::WeakPtr<EmbeddedWorkerTestHelper> helper) |
67 : helper_(helper), binding_(this) {} | 76 : helper_(helper), binding_(this) {} |
68 | 77 |
69 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient:: | 78 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient:: |
70 ~MockEmbeddedWorkerInstanceClient() {} | 79 ~MockEmbeddedWorkerInstanceClient() {} |
71 | 80 |
72 void EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::StartWorker( | 81 void EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::StartWorker( |
73 const EmbeddedWorkerStartParams& params, | 82 const EmbeddedWorkerStartParams& params, |
74 mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) { | 83 mojom::ServiceWorkerEventDispatcherRequest dispatcher_request, |
| 84 mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host) { |
75 if (!helper_) | 85 if (!helper_) |
76 return; | 86 return; |
77 | 87 |
78 embedded_worker_id_ = params.embedded_worker_id; | 88 embedded_worker_id_ = params.embedded_worker_id; |
79 | 89 |
80 EmbeddedWorkerInstance* worker = | 90 EmbeddedWorkerInstance* worker = |
81 helper_->registry()->GetWorker(params.embedded_worker_id); | 91 helper_->registry()->GetWorker(params.embedded_worker_id); |
82 ASSERT_TRUE(worker); | 92 ASSERT_TRUE(worker); |
83 EXPECT_EQ(EmbeddedWorkerStatus::STARTING, worker->status()); | 93 EXPECT_EQ(EmbeddedWorkerStatus::STARTING, worker->status()); |
84 | 94 |
85 helper_->OnStartWorkerStub(params, std::move(dispatcher_request)); | 95 helper_->OnStartWorkerStub(params, std::move(dispatcher_request), |
| 96 std::move(instance_host)); |
86 } | 97 } |
87 | 98 |
88 void EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::StopWorker( | 99 void EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::StopWorker( |
89 const StopWorkerCallback& callback) { | 100 const StopWorkerCallback& callback) { |
90 if (!helper_) | 101 if (!helper_) |
91 return; | 102 return; |
92 | 103 |
93 ASSERT_TRUE(embedded_worker_id_); | 104 ASSERT_TRUE(embedded_worker_id_); |
94 EmbeddedWorkerInstance* worker = | 105 EmbeddedWorkerInstance* worker = |
95 helper_->registry()->GetWorker(embedded_worker_id_.value()); | 106 helper_->registry()->GetWorker(embedded_worker_id_.value()); |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 | 278 |
268 EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( | 279 EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( |
269 const base::FilePath& user_data_directory) | 280 const base::FilePath& user_data_directory) |
270 : browser_context_(new TestBrowserContext), | 281 : browser_context_(new TestBrowserContext), |
271 render_process_host_(new MockRenderProcessHost(browser_context_.get())), | 282 render_process_host_(new MockRenderProcessHost(browser_context_.get())), |
272 new_render_process_host_( | 283 new_render_process_host_( |
273 new MockRenderProcessHost(browser_context_.get())), | 284 new MockRenderProcessHost(browser_context_.get())), |
274 wrapper_(new ServiceWorkerContextWrapper(browser_context_.get())), | 285 wrapper_(new ServiceWorkerContextWrapper(browser_context_.get())), |
275 mock_instance_clients_next_index_(0), | 286 mock_instance_clients_next_index_(0), |
276 next_thread_id_(0), | 287 next_thread_id_(0), |
| 288 next_provider_id_(1000), |
277 mock_render_process_id_(render_process_host_->GetID()), | 289 mock_render_process_id_(render_process_host_->GetID()), |
278 new_mock_render_process_id_(new_render_process_host_->GetID()), | 290 new_mock_render_process_id_(new_render_process_host_->GetID()), |
279 weak_factory_(this) { | 291 weak_factory_(this) { |
280 std::unique_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager( | 292 std::unique_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager( |
281 new MockServiceWorkerDatabaseTaskManager( | 293 new MockServiceWorkerDatabaseTaskManager( |
282 base::ThreadTaskRunnerHandle::Get())); | 294 base::ThreadTaskRunnerHandle::Get())); |
283 wrapper_->InitInternal(user_data_directory, std::move(database_task_manager), | 295 wrapper_->InitInternal(user_data_directory, std::move(database_task_manager), |
284 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr); | 296 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr); |
285 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id()); | 297 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id()); |
286 wrapper_->process_manager()->SetNewProcessIdForTest(new_render_process_id()); | 298 wrapper_->process_manager()->SetNewProcessIdForTest(new_render_process_id()); |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 new net::HttpResponseHeaders(std::string(data, arraysize(data))); | 376 new net::HttpResponseHeaders(std::string(data, arraysize(data))); |
365 return info; | 377 return info; |
366 } | 378 } |
367 | 379 |
368 void EmbeddedWorkerTestHelper::OnStartWorker( | 380 void EmbeddedWorkerTestHelper::OnStartWorker( |
369 int embedded_worker_id, | 381 int embedded_worker_id, |
370 int64_t service_worker_version_id, | 382 int64_t service_worker_version_id, |
371 const GURL& scope, | 383 const GURL& scope, |
372 const GURL& script_url, | 384 const GURL& script_url, |
373 bool pause_after_download, | 385 bool pause_after_download, |
374 mojom::ServiceWorkerEventDispatcherRequest request) { | 386 mojom::ServiceWorkerEventDispatcherRequest request, |
| 387 mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host) { |
375 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 388 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
376 ASSERT_TRUE(worker); | 389 ASSERT_TRUE(worker); |
377 MockServiceWorkerEventDispatcher::Create(AsWeakPtr(), worker->thread_id(), | 390 MockServiceWorkerEventDispatcher::Create(AsWeakPtr(), worker->thread_id(), |
378 std::move(request)); | 391 std::move(request)); |
379 | 392 |
380 embedded_worker_id_service_worker_version_id_map_[embedded_worker_id] = | 393 embedded_worker_id_service_worker_version_id_map_[embedded_worker_id] = |
381 service_worker_version_id; | 394 service_worker_version_id; |
| 395 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id].Bind( |
| 396 std::move(instance_host)); |
| 397 |
382 SimulateWorkerReadyForInspection(embedded_worker_id); | 398 SimulateWorkerReadyForInspection(embedded_worker_id); |
383 SimulateWorkerScriptCached(embedded_worker_id); | 399 SimulateWorkerScriptCached(embedded_worker_id); |
384 SimulateWorkerScriptLoaded(embedded_worker_id); | 400 SimulateWorkerScriptLoaded(embedded_worker_id); |
385 if (!pause_after_download) | 401 if (!pause_after_download) |
386 OnResumeAfterDownload(embedded_worker_id); | 402 OnResumeAfterDownload(embedded_worker_id); |
387 } | 403 } |
388 | 404 |
389 void EmbeddedWorkerTestHelper::OnResumeAfterDownload(int embedded_worker_id) { | 405 void EmbeddedWorkerTestHelper::OnResumeAfterDownload(int embedded_worker_id) { |
390 SimulateWorkerThreadStarted(GetNextThreadId(), embedded_worker_id); | 406 SimulateWorkerThreadStarted(GetNextThreadId(), embedded_worker_id, |
| 407 GetNextProviderId()); |
391 SimulateWorkerScriptEvaluated(embedded_worker_id, true /* success */); | 408 SimulateWorkerScriptEvaluated(embedded_worker_id, true /* success */); |
392 SimulateWorkerStarted(embedded_worker_id); | 409 SimulateWorkerStarted(embedded_worker_id); |
393 } | 410 } |
394 | 411 |
395 void EmbeddedWorkerTestHelper::OnStopWorker( | 412 void EmbeddedWorkerTestHelper::OnStopWorker( |
396 const mojom::EmbeddedWorkerInstanceClient::StopWorkerCallback& callback) { | 413 const mojom::EmbeddedWorkerInstanceClient::StopWorkerCallback& callback) { |
397 // By default just notify the sender that the worker is stopped. | 414 // By default just notify the sender that the worker is stopped. |
398 callback.Run(); | 415 callback.Run(); |
399 } | 416 } |
400 | 417 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 DispatchPaymentRequestEventCallback& callback) { | 538 DispatchPaymentRequestEventCallback& callback) { |
522 response_callback->OnPaymentAppResponse( | 539 response_callback->OnPaymentAppResponse( |
523 payments::mojom::PaymentAppResponse::New(), base::Time::Now()); | 540 payments::mojom::PaymentAppResponse::New(), base::Time::Now()); |
524 callback.Run(SERVICE_WORKER_OK, base::Time::Now()); | 541 callback.Run(SERVICE_WORKER_OK, base::Time::Now()); |
525 } | 542 } |
526 | 543 |
527 void EmbeddedWorkerTestHelper::SimulateWorkerReadyForInspection( | 544 void EmbeddedWorkerTestHelper::SimulateWorkerReadyForInspection( |
528 int embedded_worker_id) { | 545 int embedded_worker_id) { |
529 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 546 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
530 ASSERT_TRUE(worker); | 547 ASSERT_TRUE(worker); |
531 registry()->OnWorkerReadyForInspection(worker->process_id(), | 548 ASSERT_TRUE(embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]); |
532 embedded_worker_id); | 549 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id] |
| 550 ->OnReadyForInspection(); |
| 551 NestedLoopRunUntilIdle(); |
533 } | 552 } |
534 | 553 |
535 void EmbeddedWorkerTestHelper::SimulateWorkerScriptCached( | 554 void EmbeddedWorkerTestHelper::SimulateWorkerScriptCached( |
536 int embedded_worker_id) { | 555 int embedded_worker_id) { |
537 int64_t version_id = | 556 int64_t version_id = |
538 embedded_worker_id_service_worker_version_id_map_[embedded_worker_id]; | 557 embedded_worker_id_service_worker_version_id_map_[embedded_worker_id]; |
539 ServiceWorkerVersion* version = context()->GetLiveVersion(version_id); | 558 ServiceWorkerVersion* version = context()->GetLiveVersion(version_id); |
540 if (!version) | 559 if (!version) |
541 return; | 560 return; |
542 if (!version->script_cache_map()->size()) { | 561 if (!version->script_cache_map()->size()) { |
543 std::vector<ServiceWorkerDatabase::ResourceRecord> records; | 562 std::vector<ServiceWorkerDatabase::ResourceRecord> records; |
544 // Add a dummy ResourceRecord for the main script to the script cache map of | 563 // Add a dummy ResourceRecord for the main script to the script cache map of |
545 // the ServiceWorkerVersion. We use embedded_worker_id for resource_id to | 564 // the ServiceWorkerVersion. We use embedded_worker_id for resource_id to |
546 // avoid ID collision. | 565 // avoid ID collision. |
547 records.push_back(ServiceWorkerDatabase::ResourceRecord( | 566 records.push_back(ServiceWorkerDatabase::ResourceRecord( |
548 embedded_worker_id, version->script_url(), 100)); | 567 embedded_worker_id, version->script_url(), 100)); |
549 version->script_cache_map()->SetResources(records); | 568 version->script_cache_map()->SetResources(records); |
550 } | 569 } |
551 if (!version->GetMainScriptHttpResponseInfo()) | 570 if (!version->GetMainScriptHttpResponseInfo()) |
552 version->SetMainScriptHttpResponseInfo(CreateHttpResponseInfo()); | 571 version->SetMainScriptHttpResponseInfo(CreateHttpResponseInfo()); |
553 } | 572 } |
554 | 573 |
555 void EmbeddedWorkerTestHelper::SimulateWorkerScriptLoaded( | 574 void EmbeddedWorkerTestHelper::SimulateWorkerScriptLoaded( |
556 int embedded_worker_id) { | 575 int embedded_worker_id) { |
557 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 576 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
558 ASSERT_TRUE(worker); | 577 ASSERT_TRUE(worker); |
559 registry()->OnWorkerScriptLoaded(worker->process_id(), embedded_worker_id); | 578 ASSERT_TRUE(embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]); |
| 579 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id] |
| 580 ->OnScriptLoaded(); |
| 581 NestedLoopRunUntilIdle(); |
560 } | 582 } |
561 | 583 |
562 void EmbeddedWorkerTestHelper::SimulateWorkerThreadStarted( | 584 void EmbeddedWorkerTestHelper::SimulateWorkerThreadStarted( |
563 int thread_id, | 585 int thread_id, |
564 int embedded_worker_id) { | 586 int embedded_worker_id, |
565 thread_id_embedded_worker_id_map_[thread_id] = embedded_worker_id; | 587 int provider_id) { |
566 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 588 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
567 ASSERT_TRUE(worker); | 589 ASSERT_TRUE(worker); |
568 registry()->OnWorkerThreadStarted(worker->process_id(), thread_id, | 590 // Prepare a provider host to be used by bellowing OnThreadStarted(). |
569 embedded_worker_id); | 591 auto host = CreateProviderHostForServiceWorkerContext( |
| 592 worker->process_id(), provider_id, true /* is_parent_frame_secure */, |
| 593 context()->AsWeakPtr()); |
| 594 context()->AddProviderHost(std::move(host)); |
| 595 |
| 596 ASSERT_TRUE(embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]); |
| 597 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id] |
| 598 ->OnThreadStarted(thread_id, provider_id); |
| 599 NestedLoopRunUntilIdle(); |
570 } | 600 } |
571 | 601 |
572 void EmbeddedWorkerTestHelper::SimulateWorkerScriptEvaluated( | 602 void EmbeddedWorkerTestHelper::SimulateWorkerScriptEvaluated( |
573 int embedded_worker_id, | 603 int embedded_worker_id, |
574 bool success) { | 604 bool success) { |
575 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 605 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
576 ASSERT_TRUE(worker); | 606 ASSERT_TRUE(worker); |
577 registry()->OnWorkerScriptEvaluated(worker->process_id(), embedded_worker_id, | 607 ASSERT_TRUE(embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]); |
578 success); | 608 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id] |
| 609 ->OnScriptEvaluated(success); |
| 610 NestedLoopRunUntilIdle(); |
579 } | 611 } |
580 | 612 |
581 void EmbeddedWorkerTestHelper::SimulateWorkerStarted(int embedded_worker_id) { | 613 void EmbeddedWorkerTestHelper::SimulateWorkerStarted(int embedded_worker_id) { |
582 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 614 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
583 ASSERT_TRUE(worker); | 615 ASSERT_TRUE(worker); |
584 registry()->OnWorkerStarted(worker->process_id(), embedded_worker_id); | 616 ASSERT_TRUE(embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]); |
| 617 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]->OnStarted(); |
| 618 NestedLoopRunUntilIdle(); |
585 } | 619 } |
586 | 620 |
587 void EmbeddedWorkerTestHelper::SimulateWorkerStopped(int embedded_worker_id) { | 621 void EmbeddedWorkerTestHelper::SimulateWorkerStopped(int embedded_worker_id) { |
588 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 622 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
589 if (worker) | 623 if (worker) { |
590 registry()->OnWorkerStopped(worker->process_id(), embedded_worker_id); | 624 ASSERT_TRUE(embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]); |
| 625 embedded_worker_id_instance_host_ptr_map_[embedded_worker_id]->OnStopped(); |
| 626 NestedLoopRunUntilIdle(); |
| 627 } |
591 } | 628 } |
592 | 629 |
593 void EmbeddedWorkerTestHelper::SimulateSend(IPC::Message* message) { | 630 void EmbeddedWorkerTestHelper::SimulateSend(IPC::Message* message) { |
594 registry()->OnMessageReceived(*message, mock_render_process_id_); | 631 registry()->OnMessageReceived(*message, mock_render_process_id_); |
595 delete message; | 632 delete message; |
596 } | 633 } |
597 | 634 |
598 void EmbeddedWorkerTestHelper::OnStartWorkerStub( | 635 void EmbeddedWorkerTestHelper::OnStartWorkerStub( |
599 const EmbeddedWorkerStartParams& params, | 636 const EmbeddedWorkerStartParams& params, |
600 mojom::ServiceWorkerEventDispatcherRequest request) { | 637 mojom::ServiceWorkerEventDispatcherRequest request, |
| 638 mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host) { |
601 EmbeddedWorkerInstance* worker = | 639 EmbeddedWorkerInstance* worker = |
602 registry()->GetWorker(params.embedded_worker_id); | 640 registry()->GetWorker(params.embedded_worker_id); |
603 ASSERT_TRUE(worker); | 641 ASSERT_TRUE(worker); |
604 EXPECT_EQ(EmbeddedWorkerStatus::STARTING, worker->status()); | 642 EXPECT_EQ(EmbeddedWorkerStatus::STARTING, worker->status()); |
605 base::ThreadTaskRunnerHandle::Get()->PostTask( | 643 base::ThreadTaskRunnerHandle::Get()->PostTask( |
606 FROM_HERE, | 644 FROM_HERE, |
607 base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker, AsWeakPtr(), | 645 base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker, AsWeakPtr(), |
608 params.embedded_worker_id, params.service_worker_version_id, | 646 params.embedded_worker_id, params.service_worker_version_id, |
609 params.scope, params.script_url, params.pause_after_download, | 647 params.scope, params.script_url, params.pause_after_download, |
610 base::Passed(&request))); | 648 base::Passed(&request), base::Passed(&instance_host))); |
611 } | 649 } |
612 | 650 |
613 void EmbeddedWorkerTestHelper::OnResumeAfterDownloadStub( | 651 void EmbeddedWorkerTestHelper::OnResumeAfterDownloadStub( |
614 int embedded_worker_id) { | 652 int embedded_worker_id) { |
615 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 653 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
616 ASSERT_TRUE(worker); | 654 ASSERT_TRUE(worker); |
617 base::ThreadTaskRunnerHandle::Get()->PostTask( | 655 base::ThreadTaskRunnerHandle::Get()->PostTask( |
618 FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnResumeAfterDownload, | 656 FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnResumeAfterDownload, |
619 AsWeakPtr(), embedded_worker_id)); | 657 AsWeakPtr(), embedded_worker_id)); |
620 } | 658 } |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 service_manager::InterfaceProviderSpec()); | 821 service_manager::InterfaceProviderSpec()); |
784 | 822 |
785 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces( | 823 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces( |
786 new service_manager::InterfaceProvider); | 824 new service_manager::InterfaceProvider); |
787 remote_interfaces->Bind(std::move(interfaces)); | 825 remote_interfaces->Bind(std::move(interfaces)); |
788 rph->SetRemoteInterfaces(std::move(remote_interfaces)); | 826 rph->SetRemoteInterfaces(std::move(remote_interfaces)); |
789 return registry; | 827 return registry; |
790 } | 828 } |
791 | 829 |
792 } // namespace content | 830 } // namespace content |
OLD | NEW |