Replace ServiceInfo with BindSourceInfo.

content/common/service_manager/service_manager_connection_impl.h

Index: content/common/service_manager/service_manager_connection_impl.h
diff --git a/content/common/service_manager/service_manager_connection_impl.h b/content/common/service_manager/service_manager_connection_impl.h
index 6ef897e1628d16bb128916d9f142f3f318946204..98219e0bfd133add058d5260ce45ff8a2934cb5f 100644
--- a/content/common/service_manager/service_manager_connection_impl.h
+++ b/content/common/service_manager/service_manager_connection_impl.h
@@ -37,8 +37,7 @@ class CONTENT_EXPORT ServiceManagerConnectionImpl
   // 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;
@@ -50,17 +49,16 @@ class CONTENT_EXPORT ServiceManagerConnectionImpl
   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_;