Cleanup display creation in mus tests.

services/ui/ws/window_tree_unittest.cc

 // Copyright 2014 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 "services/ui/ws/window_tree.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/ui/common/types.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/default_access_policy.h"
+#include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h"
 #include "services/ui/ws/test_change_tracker.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 #include "services/ui/ws/test_utils.h"
 #include "services/ui/ws/window_manager_access_policy.h"
@@ skipping 1317 matching lines @@
 
 using WindowTreeShutdownTest = testing::Test;
 
 // Makes sure WindowTreeClient doesn't get any messages during shutdown.
 TEST_F(WindowTreeShutdownTest, DontSendMessagesDuringShutdown) {
   std::unique_ptr<TestWindowTreeClient> client;
   {
     // Create a tree with one window.
     WindowServerTestHelper ws_test_helper;
     WindowServer* window_server = ws_test_helper.window_server();
+    TestPlatformScreen platform_screen;
+    platform_screen.Init(window_server->display_manager());
     window_server->user_id_tracker()->AddUserId(kTestUserId1);
-    const int kNumHostsToCreate = 1;
-    ws_test_helper.window_server_delegate()->CreateDisplays(kNumHostsToCreate);
+    platform_screen.AddDisplay();
 
     AddWindowManager(window_server, kTestUserId1);
     window_server->user_id_tracker()->SetActiveUserId(kTestUserId1);
     TestWindowTreeBinding* test_binding =
         ws_test_helper.window_server_delegate()->last_binding();
     ASSERT_TRUE(test_binding);
     WindowTree* tree = test_binding->tree();
     const ClientWindowId window_id = BuildClientWindowId(tree, 2);
     ASSERT_TRUE(tree->NewWindow(window_id, ServerWindow::Properties()));
 
     // Release the client so that it survices shutdown.
     client = test_binding->ReleaseClient();
     client->tracker()->changes()->clear();
   }
 
   // Client should not have got any messages after shutdown.
   EXPECT_TRUE(client->tracker()->changes()->empty());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui