Replace ServiceInfo with BindSourceInfo.

services/preferences/pref_store_manager_impl.cc

 // 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.
 
 #include "services/preferences/pref_store_manager_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/prefs/default_pref_store.h"
 #include "components/prefs/pref_value_store.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/preferences/persistent_pref_store_factory.h"
 #include "services/preferences/persistent_pref_store_impl.h"
 #include "services/preferences/public/cpp/pref_store_impl.h"
-#include "services/service_manager/public/cpp/service_info.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
 
 namespace prefs {
 namespace {
 
 using ConnectCallback = mojom::PrefStoreConnector::ConnectCallback;
 using PrefStorePtrs =
     std::unordered_map<PrefValueStore::PrefStoreType, mojom::PrefStore*>;
 
 // Used to make sure all pref stores have been registered before replying to any
 // Connect calls.
@@ skipping 175 matching lines @@
       base::Bind(&PrefStoreManagerImpl::OnPersistentPrefStoreReady,
                  base::Unretained(this)));
   DCHECK(persistent_pref_store_);
   if (AllConnected())
     ProcessPendingConnects();
 }
 
 void PrefStoreManagerImpl::OnStart() {}
 
 void PrefStoreManagerImpl::OnBindInterface(
-    const service_manager::ServiceInfo& source_info,
+    const service_manager::BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {
   registry_.BindInterface(source_info.identity, interface_name,
                           std::move(interface_pipe));
 }
 
 void PrefStoreManagerImpl::OnPrefStoreDisconnect(
     PrefValueStore::PrefStoreType type) {
   DVLOG(1) << "Deregistering pref store: " << type;
   pref_store_ptrs_.erase(type);
@@ skipping 45 matching lines @@
 }
 
 void PrefStoreManagerImpl::OnPersistentPrefStoreReady() {
   DVLOG(1) << "PersistentPrefStore ready";
   if (AllConnected()) {
     ProcessPendingConnects();
   }
 }
 
 }  // namespace prefs