Replace ServiceInfo with BindSourceInfo.

content/child/child_thread_impl.h

Index: content/child/child_thread_impl.h
diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h
index af17dac6f05637b15ddb30d9253dce1d03d19c69..dccc0e0dff585cc1fc76bbe4494c4e66491317b8 100644
--- a/content/child/child_thread_impl.h
+++ b/content/child/child_thread_impl.h
@@ -27,7 +27,7 @@
 #include "ipc/message_router.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/associated_binding_set.h"
-#include "services/service_manager/public/cpp/service_info.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
 
 namespace base {
 class MessageLoop;
@@ -94,10 +94,10 @@ class CONTENT_EXPORT ChildThreadImpl
   ServiceManagerConnection* GetServiceManagerConnection() override;
   service_manager::Connector* GetConnector() override;
 
-  // Returns the service_manager::ServiceInfo for the child process & the
+  // Returns the service_manager::BindSourceInfo for the child process & the
   // browser process, once available.
-  const service_manager::ServiceInfo& GetChildServiceInfo() const;
-  const service_manager::ServiceInfo& GetBrowserServiceInfo() const;
+  const service_manager::BindSourceInfo& GetChildServiceInfo() const;
+  const service_manager::BindSourceInfo& GetBrowserServiceInfo() const;
   bool IsConnectedToBrowser() const;
 
   IPC::SyncChannel* channel() { return channel_.get(); }
@@ -241,15 +241,13 @@ class CONTENT_EXPORT ChildThreadImpl
 
   // Called when a connection is received from another service. When that other
   // service is the browser process, stores the remote's info.
-  void OnServiceConnect(const service_manager::ServiceInfo& local_info,
-                        const service_manager::ServiceInfo& remote_info);
+  void OnServiceConnect(const service_manager::BindSourceInfo& remote_info);
 
   std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
   std::unique_ptr<ServiceManagerConnection> service_manager_connection_;
 
   bool connected_to_browser_ = false;
-  service_manager::ServiceInfo child_info_;
-  service_manager::ServiceInfo browser_info_;
+  service_manager::BindSourceInfo browser_info_;
 
   mojo::AssociatedBinding<mojom::RouteProvider> route_provider_binding_;
   mojo::AssociatedBindingSet<mojom::AssociatedInterfaceProvider, int32_t>