| Index: content/browser/mojo/mojo_application_host.cc
|
| diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
|
| index 90187b9b92f8fec4adbb38f754d314773d48648a..2491252891316e369215592f97d9b3debeba9c2d 100644
|
| --- a/content/browser/mojo/mojo_application_host.cc
|
| +++ b/content/browser/mojo/mojo_application_host.cc
|
| @@ -30,7 +30,7 @@ MojoApplicationHost::~MojoApplicationHost() {
|
| }
|
|
|
| bool MojoApplicationHost::Init() {
|
| - DCHECK(!child_service_provider_.get()) << "Already initialized!";
|
| + DCHECK(!client_handle_.is_valid()) << "Already initialized!";
|
|
|
| mojo::embedder::PlatformChannelPair channel_pair;
|
|
|
| @@ -43,8 +43,7 @@ bool MojoApplicationHost::Init() {
|
| // Forward this to the client once we know its process handle.
|
| client_handle_ = channel_pair.PassClientHandle();
|
|
|
| - child_service_provider_.reset(
|
| - BindToPipe(new ServiceProviderImpl(), message_pipe.Pass()));
|
| + service_registry_.BindRemoteServiceProvider(message_pipe.Pass());
|
| return true;
|
| }
|
|
|
| @@ -60,12 +59,4 @@ bool MojoApplicationHost::Activate(IPC::Sender* sender,
|
| return did_activate_;
|
| }
|
|
|
| -void MojoApplicationHost::ServiceProviderImpl::ConnectToService(
|
| - const mojo::String& service_url,
|
| - const mojo::String& service_name,
|
| - mojo::ScopedMessagePipeHandle handle,
|
| - const mojo::String& requestor_url) {
|
| - // TODO(darin): Provide something meaningful here.
|
| -}
|
| -
|
| } // namespace content
|
|
|