Replace ServiceInfo with BindSourceInfo.

services/service_manager/public/cpp/bind_source_info_struct_traits.h

Index: services/service_manager/public/cpp/bind_source_info_struct_traits.h
diff --git a/services/service_manager/public/cpp/bind_source_info_struct_traits.h b/services/service_manager/public/cpp/bind_source_info_struct_traits.h
new file mode 100644
index 0000000000000000000000000000000000000000..317faff475553c79fc0907891766212ba746f54e
--- /dev/null
+++ b/services/service_manager/public/cpp/bind_source_info_struct_traits.h
@@ -0,0 +1,33 @@
+// Copyright 2017 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_BIND_SOURCE_INFO_STRUCT_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_STRUCT_TRAITS_H_
+
+#include "services/service_manager/public/cpp/bind_source_info.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+
+namespace mojo {
+
+template <>
+struct StructTraits<service_manager::mojom::BindSourceInfo::DataView,
+                    service_manager::BindSourceInfo> {
+  static const service_manager::Identity& identity(
+      const service_manager::BindSourceInfo& source) {
+    return source.identity;
+  }
+  static const service_manager::CapabilitySet& required_capabilities(
+      const service_manager::BindSourceInfo& source) {
+    return source.required_capabilities;
+  }
+  static bool Read(service_manager::mojom::BindSourceInfoDataView data,
+                   service_manager::BindSourceInfo* out) {
+    return data.ReadIdentity(&out->identity) &&
+           data.ReadRequiredCapabilities(&out->required_capabilities);
+  }
+};
+
+}  // namespace mojo
+
+#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_STRUCT_TRAITS_H_