Replace ServiceInfo with BindSourceInfo.

content/child/child_thread_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/child/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 249 matching lines @@
   mojo::edk::SetParentPipeHandle(std::move(platform_channel));
 }
 
 class ChannelBootstrapFilter : public ConnectionFilter {
  public:
   explicit ChannelBootstrapFilter(IPC::mojom::ChannelBootstrapPtrInfo bootstrap)
       : bootstrap_(std::move(bootstrap)) {}
 
  private:
   // ConnectionFilter:
-  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle* interface_pipe,
                        service_manager::Connector* connector) override {
     if (source_info.identity.name() != mojom::kBrowserServiceName)
       return;
 
     if (interface_name == IPC::mojom::ChannelBootstrap::Name_) {
       DCHECK(bootstrap_.is_valid());
       mojo::FuseInterface(mojo::MakeRequest<IPC::mojom::ChannelBootstrap>(
                               std::move(*interface_pipe)),
@@ skipping 343 matching lines @@
 }
 
 ServiceManagerConnection* ChildThreadImpl::GetServiceManagerConnection() {
   return service_manager_connection_.get();
 }
 
 service_manager::Connector* ChildThreadImpl::GetConnector() {
   return service_manager_connection_->GetConnector();
 }
 
-const service_manager::ServiceInfo&
-    ChildThreadImpl::GetChildServiceInfo() const {
-  DCHECK(IsConnectedToBrowser());
-  return child_info_;
-}
-
-const service_manager::ServiceInfo&
-    ChildThreadImpl::GetBrowserServiceInfo() const {
+const service_manager::BindSourceInfo& ChildThreadImpl::GetBrowserServiceInfo()
+    const {
   DCHECK(IsConnectedToBrowser());
   return browser_info_;
 }
 
 bool ChildThreadImpl::IsConnectedToBrowser() const {
   return connected_to_browser_;
 }
 
 IPC::MessageRouter* ChildThreadImpl::GetRouter() {
   DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
@@ skipping 185 matching lines @@
     const std::string& name,
     mojom::AssociatedInterfaceAssociatedRequest request) {
   int32_t routing_id =
       associated_interface_provider_bindings_.dispatch_context();
   Listener* route = router_.GetRoute(routing_id);
   if (route)
     route->OnAssociatedInterfaceRequest(name, request.PassHandle());
 }
 
 void ChildThreadImpl::OnServiceConnect(
-    const service_manager::ServiceInfo& local_info,
-    const service_manager::ServiceInfo& remote_info) {
+    const service_manager::BindSourceInfo& remote_info) {
   if (remote_info.identity.name() != mojom::kBrowserServiceName)
     return;
   DCHECK(!connected_to_browser_);
   connected_to_browser_ = true;
-  child_info_ = local_info;
   browser_info_ = remote_info;
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content