Cleanup display creation in mus tests.

services/ui/ws/user_display_manager_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/atomicops.h"
 #include "base/macros.h"
@@ skipping 18 matching lines @@
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
-// Stub PlatformScreen implementation so PlatformScreen::GetInstance() doesn't
-// fail.
-class TestPlatformScreen : public display::PlatformScreen {
- public:
-  TestPlatformScreen() {}
-  ~TestPlatformScreen() override {}
-
-  // display::PlatformScreen:
-  void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
-  void Init(display::PlatformScreenDelegate* delegate) override {}
-  void RequestCloseDisplay(int64_t display_id) override {}
-  int64_t GetPrimaryDisplayId() const override { return 1; }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestPlatformScreen);
-};
-
 class TestDisplayManagerObserver : public mojom::DisplayManagerObserver {
  public:
   TestDisplayManagerObserver() {}
   ~TestDisplayManagerObserver() override {}
 
   std::string GetAndClearObserverCalls() {
     std::string result;
     std::swap(observer_calls_, result);
     return result;
   }
@@ skipping 48 matching lines @@
 class UserDisplayManagerTest : public testing::Test {
  public:
   UserDisplayManagerTest() {}
   ~UserDisplayManagerTest() override {}
 
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
   TestWindowServerDelegate* window_server_delegate() {
     return ws_test_helper_.window_server_delegate();
   }
 
+  TestPlatformScreen& platform_screen() { return platform_screen_; }
+
  private:
+  // testing::Test:
+  void SetUp() override {
+    platform_screen_.Init(window_server()->display_manager());
+  }
+
+  WindowServerTestHelper ws_test_helper_;
   TestPlatformScreen platform_screen_;
-  WindowServerTestHelper ws_test_helper_;
   DISALLOW_COPY_AND_ASSIGN(UserDisplayManagerTest);
 };
 
 TEST_F(UserDisplayManagerTest, OnlyNotifyWhenFrameDecorationsSet) {
-  window_server_delegate()->CreateDisplays(1);
+  platform_screen().AddDisplay();
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server()->display_manager();
   AddWindowManager(window_server(), kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   UserDisplayManagerTestApi(user_display_manager1)
       .SetTestObserver(&display_manager_observer1);
   // Observer should not have been notified yet.
   EXPECT_EQ(std::string(),
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Set the frame decoration values, which should trigger sending immediately.
   ASSERT_EQ(1u, display_manager->displays().size());
   window_server()
       ->window_manager_window_tree_factory_set()
       ->GetWindowManagerStateForUser(kUserId1)
       ->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());
   EXPECT_EQ("OnDisplays 1",
             display_manager_observer1.GetAndClearObserverCalls());
 
   UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr);
 }
 
 TEST_F(UserDisplayManagerTest, AddObserverAfterFrameDecorationsSet) {
-  window_server_delegate()->CreateDisplays(1);
+  platform_screen().AddDisplay();
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server()->display_manager();
   AddWindowManager(window_server(), kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   ASSERT_EQ(1u, display_manager->displays().size());
   window_server()
       ->window_manager_window_tree_factory_set()
       ->GetWindowManagerStateForUser(kUserId1)
       ->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());
 
   UserDisplayManagerTestApi(user_display_manager1)
       .SetTestObserver(&display_manager_observer1);
   EXPECT_EQ("OnDisplays 1",
             display_manager_observer1.GetAndClearObserverCalls());
 
   UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr);
 }
 
 TEST_F(UserDisplayManagerTest, AddRemoveDisplay) {
-  window_server_delegate()->CreateDisplays(1);
+  platform_screen().AddDisplay();
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server()->display_manager();
   AddWindowManager(window_server(), kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   ASSERT_EQ(1u, display_manager->displays().size());
   window_server()
       ->window_manager_window_tree_factory_set()
       ->GetWindowManagerStateForUser(kUserId1)
       ->SetFrameDecorationValues(CreateDefaultFrameDecorationValues());
   UserDisplayManagerTestApi(user_display_manager1)
       .SetTestObserver(&display_manager_observer1);
   EXPECT_EQ("OnDisplays 1",
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Add another display.
-  Display* display2 = new Display(window_server());
-  display2->Init(PlatformDisplayInitParams(), nullptr);
+  const int64_t second_display_id = platform_screen().AddDisplay();
 
   // Observer should be notified immediately as frame decorations were set.
   EXPECT_EQ("OnDisplaysChanged 2",
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Remove the display and verify observer is notified.
-  display_manager->DestroyDisplay(display2);
-  display2 = nullptr;
+  platform_screen().RemoveDisplay(second_display_id);
   EXPECT_EQ("OnDisplayRemoved 2",
             display_manager_observer1.GetAndClearObserverCalls());
 
   UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr);
 }
 
 TEST_F(UserDisplayManagerTest, NegativeCoordinates) {
-  window_server_delegate()->CreateDisplays(1);
+  platform_screen().AddDisplay();
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server()->display_manager();
   AddWindowManager(window_server(), kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
 
   user_display_manager1->OnMouseCursorLocationChanged(gfx::Point(-10, -11));
@@ skipping 10 matching lines @@
   base::subtle::Atomic32 location =
       base::subtle::NoBarrier_Load(cursor_location_memory);
   EXPECT_EQ(gfx::Point(static_cast<int16_t>(location >> 16),
                        static_cast<int16_t>(location & 0xFFFF)),
             gfx::Point(-10, -11));
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui