Changes how window manager obtains WindowTree from mus

components/mus/ws/cursor_unittest.cc

 // 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.
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 33 matching lines @@
   void SetUp() override {
     PlatformDisplay::set_factory_for_testing(&platform_display_factory_);
     window_server_.reset(
         new WindowServer(&window_server_delegate_,
                          scoped_refptr<SurfacesState>(new SurfacesState)));
     window_server_delegate_.set_window_server(window_server_.get());
 
     window_server_delegate_.set_num_displays_to_create(1);
 
     // As a side effect, this allocates Displays.
-    WindowManagerFactoryRegistryTestApi(
-        window_server_->window_manager_factory_registry())
-        .AddService(kTestId1, &test_window_manager_factory_);
+    WindowManagerWindowTreeFactorySetTestApi(
+        window_server_->window_manager_window_tree_factory_set())
+        .Add(kTestId1);
     window_server_->user_id_tracker()->SetActiveUserId(kTestId1);
   }
 
   ServerWindow* GetRoot() {
     DisplayManager* display_manager = window_server_->display_manager();
     //    ASSERT_EQ(1u, display_manager->displays().size());
     Display* display = *display_manager->displays().begin();
     WindowManagerState* state = display->GetWindowManagerStateForUser(kTestId1);
     return state->root();
   }
@@ skipping 29 matching lines @@
         ui::MouseEvent(ui::ET_MOUSE_MOVED, p, p, base::TimeTicks(), 0, 0)));
     active_wms->OnEventAck(active_wms->tree(), mojom::EventResult::HANDLED);
   }
 
  protected:
   int32_t cursor_id_;
   TestPlatformDisplayFactory platform_display_factory_;
   TestWindowServerDelegate window_server_delegate_;
   std::unique_ptr<WindowServer> window_server_;
   base::MessageLoop message_loop_;
-  TestWindowManagerFactory test_window_manager_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CursorTest);
 };
 
 TEST_F(CursorTest, ChangeByMouseMove) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
   EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
@@ skipping 68 matching lines @@
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id_));
 
   win->SetBounds(gfx::Rect(0, 0, 30, 30));
   EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(cursor_id_));
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus