Replace ServiceInfo with BindSourceInfo.

services/service_manager/public/cpp/service.h

Index: services/service_manager/public/cpp/service.h
diff --git a/services/service_manager/public/cpp/service.h b/services/service_manager/public/cpp/service.h
index 9d0c04e856aec83733218722c2bb3fb3b98a7024..45f5708280e2807dc71efd0b1e27e47d615ed03c 100644
--- a/services/service_manager/public/cpp/service.h
+++ b/services/service_manager/public/cpp/service.h
@@ -13,7 +13,7 @@
 namespace service_manager {
 
 class ServiceContext;
-struct ServiceInfo;
+struct BindSourceInfo;
 
 // The primary contract between a Service and the Service Manager, receiving
 // lifecycle notifications and connection requests.
@@ -27,12 +27,12 @@ class Service {
   // will be made before this.
   virtual void OnStart();
 
-  // Called when the service identified by |source_info| requests this service
-  // bind a request for |interface_name|. If this method has been called, the
-  // service manager has already determined that policy permits this interface
-  // to be bound, so the implementation of this method can trust that it should
-  // just blindly bind it under most conditions.
-  virtual void OnBindInterface(const ServiceInfo& source_info,
+  // Called when the service identified by |source.identity| requests this
+  // service bind a request for |interface_name|. If this method has been
+  // called, the service manager has already determined that policy permits this
+  // interface to be bound, so the implementation of this method can trust that
+  // it should just blindly bind it under most conditions.
+  virtual void OnBindInterface(const BindSourceInfo& source,
                                const std::string& interface_name,
                                mojo::ScopedMessagePipeHandle interface_pipe);
 
@@ -78,7 +78,7 @@ class ForwardingService : public Service {
 
   // Service:
   void OnStart() override;
-  void OnBindInterface(const ServiceInfo& remote_info,
+  void OnBindInterface(const BindSourceInfo& source,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
   bool OnServiceManagerConnectionLost() override;