Replace ServiceInfo with BindSourceInfo.

services/ui/ws/window_server_test_base.cc

 // Copyright 2015 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/ui/ws/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 98 matching lines @@
   // WindowTreeHost depends on WindowTreeClient.
   window_tree_hosts_.clear();
   window_tree_clients_.clear();
   env_.reset();
   display::Screen::SetScreenInstance(nullptr);
 
   WindowServerServiceTestBase::TearDown();
 }
 
 void WindowServerTestBase::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 WindowServerTestBase::OnEmbed(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   EXPECT_TRUE(QuitRunLoop());
   window_tree_hosts_.push_back(std::move(window_tree_host));
@@ skipping 164 matching lines @@
        ++iter) {
     if ((*iter).get() == window_tree_host) {
       window_tree_hosts_.erase(iter);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ui