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 <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 std::unique_ptr<service_manager::InterfaceRegistry> | 572 std::unique_ptr<service_manager::InterfaceRegistry> |
573 EmbeddedWorkerTestHelper::CreateInterfaceRegistry(MockRenderProcessHost* rph) { | 573 EmbeddedWorkerTestHelper::CreateInterfaceRegistry(MockRenderProcessHost* rph) { |
574 auto registry = | 574 auto registry = |
575 base::MakeUnique<service_manager::InterfaceRegistry>(std::string()); | 575 base::MakeUnique<service_manager::InterfaceRegistry>(std::string()); |
576 registry->AddInterface( | 576 registry->AddInterface( |
577 base::Bind(&MockEmbeddedWorkerSetup::Create, AsWeakPtr())); | 577 base::Bind(&MockEmbeddedWorkerSetup::Create, AsWeakPtr())); |
578 registry->AddInterface( | 578 registry->AddInterface( |
579 base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr())); | 579 base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr())); |
580 | 580 |
581 service_manager::mojom::InterfaceProviderPtr interfaces; | 581 service_manager::mojom::InterfaceProviderPtr interfaces; |
582 registry->Bind(mojo::GetProxy(&interfaces), service_manager::Identity(), | 582 registry->Bind(mojo::MakeRequest(&interfaces), service_manager::Identity(), |
583 service_manager::InterfaceProviderSpec(), | 583 service_manager::InterfaceProviderSpec(), |
584 service_manager::Identity(), | 584 service_manager::Identity(), |
585 service_manager::InterfaceProviderSpec()); | 585 service_manager::InterfaceProviderSpec()); |
586 | 586 |
587 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces( | 587 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces( |
588 new service_manager::InterfaceProvider); | 588 new service_manager::InterfaceProvider); |
589 remote_interfaces->Bind(std::move(interfaces)); | 589 remote_interfaces->Bind(std::move(interfaces)); |
590 rph->SetRemoteInterfaces(std::move(remote_interfaces)); | 590 rph->SetRemoteInterfaces(std::move(remote_interfaces)); |
591 return registry; | 591 return registry; |
592 } | 592 } |
593 | 593 |
594 } // namespace content | 594 } // namespace content |
OLD | NEW |