Replace ServiceInfo with BindSourceInfo.

content/common/service_manager/service_manager_connection_impl.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_COMMON_SERVICE_MANAGER_SERVICE_MANAGER_CONNECTION_IMPL_H_
 #define CONTENT_COMMON_SERVICE_MANAGER_SERVICE_MANAGER_CONNECTION_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 19 matching lines @@
       service_manager::mojom::ServiceRequest request,
       scoped_refptr<base::SequencedTaskRunner> io_task_runner);
   ~ServiceManagerConnectionImpl() override;
 
  private:
   class IOThreadContext;
 
   // ServiceManagerConnection:
   void Start() override;
   service_manager::Connector* GetConnector() override;
-  const service_manager::ServiceInfo& GetLocalInfo() const override;
-  const service_manager::ServiceInfo& GetBrowserInfo() const override;
+  const service_manager::BindSourceInfo& GetBrowserInfo() const override;
   void SetConnectionLostClosure(const base::Closure& closure) override;
   int AddConnectionFilter(std::unique_ptr<ConnectionFilter> filter) override;
   void RemoveConnectionFilter(int filter_id) override;
   void AddEmbeddedService(const std::string& name,
                           const ServiceInfo& info) override;
   void AddServiceRequestHandler(
       const std::string& name,
       const ServiceRequestHandler& handler) override;
   int AddOnConnectHandler(const OnConnectHandler& handler) override;
   void RemoveOnConnectHandler(int id) override;
 
-  void OnLocalServiceInfoAvailable(
-      const service_manager::ServiceInfo& local_info);
+  void OnLocalServiceInfoAvailable(const service_manager::Identity& identity);
   void OnBrowserServiceInfoAvailable(
-      const service_manager::ServiceInfo& browser_info);
+      const service_manager::BindSourceInfo& browser_info);
   void OnConnectionLost();
   void GetInterface(service_manager::mojom::InterfaceProvider* provider,
                     const std::string& interface_name,
                     mojo::ScopedMessagePipeHandle request_handle);
 
-  service_manager::ServiceInfo local_info_;
-  service_manager::ServiceInfo browser_info_;
+  service_manager::Identity identity_;
+  service_manager::BindSourceInfo browser_info_;
 
   std::unique_ptr<service_manager::Connector> connector_;
   scoped_refptr<IOThreadContext> context_;
 
   base::Closure connection_lost_handler_;
 
   int next_on_connect_handler_id_ = 0;
   std::map<int, OnConnectHandler> on_connect_handlers_;
 
   base::WeakPtrFactory<ServiceManagerConnectionImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnectionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_SERVICE_MANAGER_SERVICE_MANAGER_CONNECTION_IMPL_H_