Eliminate OnConnect usage

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"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/display/display.h"
 #include "ui/display/display_list.h"
 #include "ui/wm/core/capture_controller.h"
 
 namespace ui {
 namespace {
 
 base::RunLoop* current_run_loop = nullptr;
 
 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) {
   CHECK(current_run_loop);
   *timeout = true;
   timeout_task.Run();
 }
 
 }  // namespace
 
-WindowServerTestBase::WindowServerTestBase() {}
+WindowServerTestBase::WindowServerTestBase() {
+  registry_.AddInterface<mojom::WindowTreeClient>(this);
+}
 
 WindowServerTestBase::~WindowServerTestBase() {}
 
 // static
 bool WindowServerTestBase::DoRunLoopWithTimeout() {
   if (current_run_loop != nullptr)
     return false;
 
   bool timeout = false;
   base::RunLoop run_loop;
@@ skipping 60 matching lines @@
 void WindowServerTestBase::TearDown() {
   // WindowTreeHost depends on WindowTreeClient.
   window_tree_hosts_.clear();
   window_tree_clients_.clear();
   env_.reset();
   display::Screen::SetScreenInstance(nullptr);
 
   WindowServerServiceTestBase::TearDown();
 }
 
-bool WindowServerTestBase::OnConnect(
-    const service_manager::Identity& remote_identity,
-    service_manager::InterfaceRegistry* registry) {
-  registry->AddInterface<mojom::WindowTreeClient>(this);
-  return true;
+void WindowServerTestBase::OnBindInterface(
+    const service_manager::ServiceInfo& 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));
 }
 
 void WindowServerTestBase::OnLostConnection(aura::WindowTreeClient* client) {
   window_tree_client_lost_connection_ = true;
@@ skipping 158 matching lines @@
        ++iter) {
     if ((*iter).get() == window_tree_host) {
       window_tree_hosts_.erase(iter);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ui