Replace ServiceInfo with BindSourceInfo.

content/public/common/service_manager_connection.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_
 #define CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
@@ skipping 19 matching lines @@
 // will be exposed to inbound connections to this object's Service.
 // Alternatively clients can define named services that will be constructed when
 // requests for those service names are received.
 // Clients must call any of the registration methods when receiving
 // ContentBrowserClient::RegisterInProcessServices().
 class CONTENT_EXPORT ServiceManagerConnection {
  public:
   using ServiceRequestHandler =
       base::Callback<void(service_manager::mojom::ServiceRequest)>;
   using OnConnectHandler =
-      base::Callback<void(const service_manager::ServiceInfo&,
-                          const service_manager::ServiceInfo&)>;
+      base::Callback<void(const service_manager::BindSourceInfo&)>;
   using Factory =
       base::Callback<std::unique_ptr<ServiceManagerConnection>(void)>;
 
   // Stores an instance of |connection| in TLS for the current process. Must be
   // called on the thread the connection was created on.
   static void SetForProcess(
       std::unique_ptr<ServiceManagerConnection> connection);
 
   // Returns the per-process instance, or nullptr if the Service Manager
   // connection has not yet been bound. Must be called on the thread the
@@ skipping 20 matching lines @@
   // Begins accepting incoming connections. Connection filters MUST be added
   // before calling this in order to avoid races. See AddConnectionFilter()
   // below.
   virtual void Start() = 0;
 
   // Returns the service_manager::Connector received via this connection's
   // Service
   // implementation. Use this to initiate connections as this object's Identity.
   virtual service_manager::Connector* GetConnector() = 0;
 
-  // Returns the service_manager::ServiceInfo for the current service and the
-  // browser service (if this is not the browser service).
-  virtual const service_manager::ServiceInfo& GetLocalInfo() const = 0;
-  virtual const service_manager::ServiceInfo& GetBrowserInfo() const = 0;
+  // Returns the service_manager::BindSourceInfo for the browser service (if
+  // this is not the browser service).
+  virtual const service_manager::BindSourceInfo& GetBrowserInfo() const = 0;
 
   // Sets a closure that is called when the connection is lost. Note that
   // connection may already have been closed, in which case |closure| will be
   // run immediately before returning from this function.
   virtual void SetConnectionLostClosure(const base::Closure& closure) = 0;
 
   static const int kInvalidConnectionFilterId = 0;
 
   // Allows the caller to filter inbound connections and/or expose interfaces
   // on them. |filter| may be created on any thread, but will be used and
@@ skipping 31 matching lines @@
   // Registers a callback to be run when the service_manager::Service
   // implementation on the IO thread receives OnConnect(). Returns an id that
   // can be passed to RemoveOnConnectHandler(), starting at 1.
   virtual int AddOnConnectHandler(const OnConnectHandler& handler) = 0;
   virtual void RemoveOnConnectHandler(int id) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_