| Index: mojo/public/cpp/application/lib/service_registry.cc
|
| diff --git a/mojo/public/cpp/application/lib/service_registry.cc b/mojo/public/cpp/application/lib/service_registry.cc
|
| index 5b7c93e18e85c1232b4f25093ac1f8c19897b11c..dea138dfcffb2e69453db677c70237af93ca832d 100644
|
| --- a/mojo/public/cpp/application/lib/service_registry.cc
|
| +++ b/mojo/public/cpp/application/lib/service_registry.cc
|
| @@ -15,13 +15,14 @@ ServiceRegistry::ServiceRegistry(
|
| ApplicationImpl* application_impl,
|
| const std::string& connection_url,
|
| const std::string& remote_url,
|
| - ServiceProviderPtr remote_services,
|
| + InterfaceHandle<ServiceProvider> remote_services,
|
| InterfaceRequest<ServiceProvider> local_services)
|
| : application_impl_(application_impl),
|
| connection_url_(connection_url),
|
| remote_url_(remote_url),
|
| local_binding_(this),
|
| - remote_service_provider_(remote_services.Pass()) {
|
| + remote_service_provider_(
|
| + ServiceProviderPtr::Create(std::move(remote_services))) {
|
| if (local_services.is_pending())
|
| local_binding_.Bind(local_services.Pass());
|
| }
|
|
|