Replace ServiceInfo with BindSourceInfo.

components/nacl/common/nacl_service.cc

Index: components/nacl/common/nacl_service.cc
diff --git a/components/nacl/common/nacl_service.cc b/components/nacl/common/nacl_service.cc
index eecc1392eae7c41a9b64723af4c89dcb04e85f97..b73ed00be9a333016f2a4683b1c648653c8cff4b 100644
--- a/components/nacl/common/nacl_service.cc
+++ b/components/nacl/common/nacl_service.cc
@@ -14,10 +14,10 @@
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
-#include "services/service_manager/public/cpp/service_info.h"
 
 #if defined(OS_POSIX)
 #include "base/posix/global_descriptors.h"
@@ -65,7 +65,7 @@ class NaClService : public service_manager::Service {
   ~NaClService() override;
 
   // Service overrides.
-  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
 
@@ -88,7 +88,7 @@ NaClService::NaClService(
 NaClService::~NaClService() = default;
 
 void NaClService::OnBindInterface(
-    const service_manager::ServiceInfo& source_info,
+    const service_manager::BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {
   if (source_info.identity.name() == content::mojom::kBrowserServiceName &&