Replace ServiceInfo with BindSourceInfo.

services/service_manager/public/cpp/service_context.h

 // Copyright 2014 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 SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 43 matching lines @@
   //
   // TODO(rockot): Clean up the connector/connector_request junk.
   ServiceContext(std::unique_ptr<service_manager::Service> service,
                  mojom::ServiceRequest request,
                  std::unique_ptr<Connector> connector = nullptr,
                  mojom::ConnectorRequest connector_request = nullptr);
 
   ~ServiceContext() override;
 
   Connector* connector() { return connector_.get(); }
-  const ServiceInfo& local_info() const { return local_info_; }
-  const Identity& identity() const { return local_info_.identity; }
+  const Identity& identity() const { return identity_; }
 
   // Specify a closure to be run when the Service calls QuitNow(), typically
   // in response to Service::OnServiceManagerConnectionLost().
   //
   // Note that if the Service has already called QuitNow(), |closure| is run
   // immediately from this method.
   //
   // NOTE: It is acceptable for |closure| to delete this ServiceContext.
   void SetQuitClosure(const base::Closure& closure);
 
@@ skipping 26 matching lines @@
   // quit closure (see SetQuitClosure() above) if one has been set.
   //
   // See comments on DisconnectFromServiceManager() regarding abrupt
   // disconnection from the Service Manager.
   void QuitNow();
 
  private:
   friend class service_manager::Service;
 
   // mojom::Service:
-  void OnStart(const ServiceInfo& info,
-               const OnStartCallback& callback) override;
-  void OnBindInterface(
-      const ServiceInfo& source_info,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle interface_pipe,
-      const OnBindInterfaceCallback& callback) override;
+  void OnStart(const Identity& info, const OnStartCallback& callback) override;
+  void OnBindInterface(const BindSourceInfo& source_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle interface_pipe,
+                       const OnBindInterfaceCallback& callback) override;
 
   void OnConnectionError();
 
   // A pending Connector request which will eventually be passed to the Service
   // Manager.
   mojom::ConnectorRequest pending_connector_request_;
 
   std::unique_ptr<service_manager::Service> service_;
   mojo::Binding<mojom::Service> binding_;
   std::unique_ptr<Connector> connector_;
-  service_manager::ServiceInfo local_info_;
+  service_manager::Identity identity_;
 
   // This instance's control interface to the service manager. Note that this
   // is unbound and therefore invalid until OnStart() is called.
   mojom::ServiceControlAssociatedPtr service_control_;
 
   // The Service may call QuitNow() before SetConnectionLostClosure(), and the
   // latter is expected to invoke the closure immediately in that case. This is
   // used to track that condition.
   //
   // TODO(rockot): Figure out who depends on this behavior and make them stop.
   // It's weird and shouldn't be necessary.
   bool service_quit_ = false;
 
   // The closure to run when QuitNow() is invoked. May delete |this|.
   base::Closure quit_closure_;
 
   base::WeakPtrFactory<ServiceContext> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceContext);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_