Eliminate OnConnect usage

services/ui/ws/window_server_test_base.h

 // 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.
 
 #ifndef SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
 
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/window_server_service_test_base.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/display/screen_base.h"
 #include "ui/wm/core/wm_state.h"
 
 namespace aura {
@@ skipping 45 matching lines @@
   // Returns the most recent WindowTreeClient that was created as the result of
   // InterfaceFactory<WindowTreeClient> being called. In other words the most
   // recent WindowTreeClient created as the result of a client embedding.
   std::unique_ptr<aura::WindowTreeClient> ReleaseMostRecentClient();
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
   // WindowServerServiceTestBase:
-  bool OnConnect(const service_manager::Identity& remote_identity,
-                 service_manager::InterfaceRegistry* registry) override;
+  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnLostConnection(aura::WindowTreeClient* client) override;
   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override;
   aura::PropertyConverter* GetPropertyConverter() override;
 
@@ skipping 63 matching lines @@
   aura::WindowTreeClient* window_manager_ = nullptr;
 
   // A test can override the WM-related behaviour by installing its own
   // WindowManagerDelegate during the test.
   aura::WindowManagerDelegate* window_manager_delegate_ = nullptr;
 
   aura::WindowManagerClient* window_manager_client_ = nullptr;
 
   bool window_tree_client_lost_connection_ = false;
 
+  service_manager::BinderRegistry registry_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_