Convert content ConnectionFilter to OnBindInterface

content/common/child_process_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/child_process_host_impl.h"
 
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
@@ skipping 91 matching lines @@
   }
 }
 
 void ChildProcessHostImpl::AddFilter(IPC::MessageFilter* filter) {
   filters_.push_back(filter);
 
   if (channel_)
     filter->OnFilterAdded(channel_.get());
 }
 
-service_manager::InterfaceProvider*
-ChildProcessHostImpl::GetRemoteInterfaces() {
-  return delegate_->GetRemoteInterfaces();
+void ChildProcessHostImpl::BindInterface(
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle interface_pipe) {
+  return delegate_->BindInterface(interface_name, std::move(interface_pipe));
 }
 
 void ChildProcessHostImpl::ForceShutdown() {
   Send(new ChildProcessMsg_Shutdown());
 }
 
 std::string ChildProcessHostImpl::CreateChannelMojo(
     mojo::edk::PendingProcessConnection* connection) {
   DCHECK(channel_id_.empty());
   channel_ =
       IPC::ChannelMojo::Create(connection->CreateMessagePipe(&channel_id_),
                                IPC::Channel::MODE_SERVER, this);
   if (!channel_ || !InitChannel())
     return std::string();
   return channel_id_;
 }
 
 void ChildProcessHostImpl::CreateChannelMojo() {
   // TODO(rockot): Remove |channel_id_| once this is the only code path by which
   // the Channel is created. For now it serves to at least mutually exclude
   // different CreateChannel* calls.
   DCHECK(channel_id_.empty());
   channel_id_ = "ChannelMojo";
 
-  service_manager::InterfaceProvider* remote_interfaces = GetRemoteInterfaces();
-  DCHECK(remote_interfaces);
-
-  IPC::mojom::ChannelBootstrapPtr bootstrap;
-  remote_interfaces->GetInterface(&bootstrap);
-  channel_ = IPC::ChannelMojo::Create(bootstrap.PassInterface().PassHandle(),
+  mojo::MessagePipe pipe;
+  BindInterface(IPC::mojom::ChannelBootstrap::Name_, std::move(pipe.handle1));
+  channel_ = IPC::ChannelMojo::Create(std::move(pipe.handle0),
                                       IPC::Channel::MODE_SERVER, this);
   DCHECK(channel_);
 
   bool initialized = InitChannel();
   DCHECK(initialized);
 }
 
 bool ChildProcessHostImpl::InitChannel() {
   if (!channel_->Connect())
     return false;
@@ skipping 124 matching lines @@
 void ChildProcessHostImpl::OnBadMessageReceived(const IPC::Message& message) {
   delegate_->OnBadMessageReceived(message);
 }
 
 void ChildProcessHostImpl::OnShutdownRequest() {
   if (delegate_->CanShutdown())
     Send(new ChildProcessMsg_Shutdown());
 }
 
 }  // namespace content