| Index: content/browser/service_worker/embedded_worker_test_helper.cc
|
| diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
|
| index f4c061905ec3f2569cc0a22b802c788d91056e87..5be0d68bc4f9c195f5bb613993c5e0d91cca6653 100644
|
| --- a/content/browser/service_worker/embedded_worker_test_helper.cc
|
| +++ b/content/browser/service_worker/embedded_worker_test_helper.cc
|
| @@ -60,8 +60,8 @@ class EmbeddedWorkerTestHelper::MockEmbeddedWorkerSetup
|
|
|
| void ExchangeInterfaceProviders(
|
| int32_t thread_id,
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services,
|
| - mojo::InterfaceProviderPtr exposed_services) override {
|
| + mojo::shell::mojom::InterfaceProviderRequest services,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services) override {
|
| if (!helper_)
|
| return;
|
| helper_->OnSetupMojoStub(thread_id, std::move(services),
|
| @@ -100,7 +100,7 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(
|
| new ServiceRegistryImpl);
|
| render_process_service_registry_.ServiceRegistry::AddService(
|
| base::Bind(&MockEmbeddedWorkerSetup::Create, weak_factory_.GetWeakPtr()));
|
| - mojo::InterfaceProviderPtr services;
|
| + mojo::shell::mojom::InterfaceProviderPtr services;
|
| render_process_service_registry_.Bind(mojo::GetProxy(&services));
|
| host_service_registry->BindRemoteServiceProvider(std::move(services));
|
| render_process_host_->SetServiceRegistry(std::move(host_service_registry));
|
| @@ -384,8 +384,8 @@ void EmbeddedWorkerTestHelper::OnPushEventStub(
|
|
|
| void EmbeddedWorkerTestHelper::OnSetupMojoStub(
|
| int thread_id,
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services,
|
| - mojo::InterfaceProviderPtr exposed_services) {
|
| + mojo::shell::mojom::InterfaceProviderRequest services,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services) {
|
| scoped_ptr<ServiceRegistryImpl> new_registry(new ServiceRegistryImpl);
|
| new_registry->Bind(std::move(services));
|
| new_registry->BindRemoteServiceProvider(std::move(exposed_services));
|
|
|