Cleanup display creation in mus tests.

services/ui/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 31 matching lines @@
 
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
   TestWindowServerDelegate* window_server_delegate() {
     return ws_test_helper_.window_server_delegate();
   }
   mojom::Cursor cursor() const { return ws_test_helper_.cursor(); }
 
  protected:
   // testing::Test:
   void SetUp() override {
-    window_server_delegate()->CreateDisplays(1);
+    platform_screen_.Init(window_server()->display_manager());
+    platform_screen_.AddDisplay();
 
     // As a side effect, this allocates Displays.
     AddWindowManager(window_server(), kTestId1);
     window_server()->user_id_tracker()->AddUserId(kTestId1);
     window_server()->user_id_tracker()->SetActiveUserId(kTestId1);
   }
 
   ServerWindow* GetRoot() {
     DisplayManager* display_manager = window_server()->display_manager();
     //    ASSERT_EQ(1u, display_manager->displays().size());
@@ skipping 33 matching lines @@
         display->GetActiveWindowManagerDisplayRoot();
     ASSERT_TRUE(active_display_root);
     static_cast<PlatformDisplayDelegate*>(display)->OnEvent(ui::PointerEvent(
         ui::MouseEvent(ui::ET_MOUSE_MOVED, p, p, base::TimeTicks(), 0, 0)));
     WindowManagerState* wms = active_display_root->window_manager_state();
     wms->OnEventAck(wms->window_tree(), mojom::EventResult::HANDLED);
   }
 
  private:
   WindowServerTestHelper ws_test_helper_;
+  TestPlatformScreen platform_screen_;
   DISALLOW_COPY_AND_ASSIGN(CursorTest);
 };
 
 TEST_F(CursorTest, ChangeByMouseMove) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
   EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
@@ skipping 61 matching lines @@
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetBounds(gfx::Rect(0, 0, 30, 30));
   EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui