Eliminate OnConnect usage

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 47 matching lines @@
   // and returns it. Calls OnDisplayAdded() on delegate.
   int64_t AddDisplay(const display::Display& display);
 
   // Calls OnDisplayModified() on delegate.
   void ModifyDisplay(const display::Display& display);
 
   // Calls OnDisplayRemoved() on delegate.
   void RemoveDisplay(int64_t id);
 
   // display::ScreenManager:
-  void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
+  void AddInterfaces(service_manager::BinderRegistry* registry) override {}
   void Init(display::ScreenManagerDelegate* delegate) override;
   void RequestCloseDisplay(int64_t display_id) override {}
 
  private:
   display::ScreenManagerDelegate* delegate_ = nullptr;
   std::unique_ptr<display::ScreenBase> screen_;
   std::set<int64_t> display_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScreenManager);
 };
@@ skipping 616 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id = nullptr);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_