Replace ServiceInfo with BindSourceInfo.

services/catalog/catalog.cc

 // 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.
 
 #include "services/catalog/catalog.h"
 
 #include <memory>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 105 matching lines @@
 class Catalog::ServiceImpl : public service_manager::Service {
  public:
   explicit ServiceImpl(Catalog* catalog) : catalog_(catalog) {
     registry_.AddInterface<mojom::Catalog>(catalog_);
     registry_.AddInterface<filesystem::mojom::Directory>(catalog_);
     registry_.AddInterface<service_manager::mojom::Resolver>(catalog_);
   }
   ~ServiceImpl() override {}
 
   // service_manager::Service:
-  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 {
     registry_.BindInterface(source_info.identity, interface_name,
                             std::move(interface_pipe));
   }
 
  private:
   Catalog* const catalog_;
   service_manager::BinderRegistry registry_;
 
@@ skipping 72 matching lines @@
   if (it != instances_.end())
     return it->second.get();
 
   auto result = instances_.insert(std::make_pair(
       user_id,
       base::MakeUnique<Instance>(&system_cache_, service_manifest_provider_)));
   return result.first->second.get();
 }
 
 }  // namespace catalog