diff options
| -rw-r--r-- | content/child/mojo/mojo_application.cc | 3 | ||||
| -rw-r--r-- | content/public/common/service_registry.h | 5 | ||||
| -rw-r--r-- | extensions/renderer/api/serial/data_receiver_unittest.cc | 2 | ||||
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/content/child/mojo/mojo_application.cc b/content/child/mojo/mojo_application.cc index fc2e989..5deee5d 100644 --- a/content/child/mojo/mojo_application.cc +++ b/content/child/mojo/mojo_application.cc @@ -44,8 +44,7 @@ void MojoApplication::OnActivate( DCHECK(message_pipe.is_valid()); ApplicationSetupPtr application_setup; - application_setup.Bind( - mojo::InterfacePtrInfo<ApplicationSetup>(message_pipe.Pass(), 0u)); + application_setup.Bind(message_pipe.Pass()); mojo::ServiceProviderPtr services; mojo::ServiceProviderPtr exposed_services; diff --git a/content/public/common/service_registry.h b/content/public/common/service_registry.h index 2d65cf9..1ce3b03 100644 --- a/content/public/common/service_registry.h +++ b/content/public/common/service_registry.h @@ -54,8 +54,9 @@ class CONTENT_EXPORT ServiceRegistry { // Connect to an interface provided by the remote service provider. template <typename Interface> void ConnectToRemoteService(mojo::InterfacePtr<Interface>* ptr) { - ConnectToRemoteService(Interface::Name_, - mojo::GetProxy(ptr).PassMessagePipe()); + mojo::MessagePipe pipe; + ptr->Bind(pipe.handle0.Pass()); + ConnectToRemoteService(Interface::Name_, pipe.handle1.Pass()); } virtual void ConnectToRemoteService(const base::StringPiece& name, mojo::ScopedMessagePipeHandle handle) = 0; diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc index 623fcbf..1be15969 100644 --- a/extensions/renderer/api/serial/data_receiver_unittest.cc +++ b/extensions/renderer/api/serial/data_receiver_unittest.cc @@ -38,7 +38,7 @@ class DataReceiverFactory : public gin::Wrappable<DataReceiverFactory> { callback_.Run(mojo::GetProxy(&sink), client.Pass()); gin::Dictionary result = gin::Dictionary::CreateEmpty(isolate_); - result.Set("source", sink.PassInterface().PassHandle().release()); + result.Set("source", sink.PassMessagePipe().release()); result.Set("client", client_request.PassMessagePipe().release()); return result; } diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index cff2789..b7192da 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -156,9 +156,7 @@ void ServerChannelMojo::OnPipeAvailable( return; } - client_channel_.Bind( - mojo::InterfacePtrInfo<ClientChannel>( - CreateMessagingPipe(handle.Pass()), 0u)); + client_channel_.Bind(CreateMessagingPipe(handle.Pass())); client_channel_.set_error_handler(this); client_channel_->Init( peer.Pass(), |