Adds ability for WindowManager to create display roots

services/ui/ws/test_utils.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 "services/ui/ws/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 185 matching lines @@
 }
 
 // TestDisplayBinding ---------------------------------------------------------
 
 WindowTree* TestDisplayBinding::CreateWindowTree(ServerWindow* root) {
   const uint32_t embed_flags = 0;
   WindowTree* tree = window_server_->EmbedAtWindow(
       root, service_manager::mojom::kRootUserID,
       ui::mojom::WindowTreeClientPtr(), embed_flags,
       base::WrapUnique(new WindowManagerAccessPolicy));
-  tree->ConfigureWindowManager();
+  tree->ConfigureWindowManager(automatically_create_display_roots_);
   return tree;
 }
 
 // TestWindowManager ----------------------------------------------------------
 
+TestWindowManager::TestWindowManager() {}
+
+TestWindowManager::~TestWindowManager() {}
+
+void TestWindowManager::OnConnect(uint16_t client_id) {
+  connect_count_++;
+}
+
+void TestWindowManager::WmNewDisplayAdded(
+    const display::Display& display,
+    ui::mojom::WindowDataPtr root,
+    bool drawn,
+    const cc::FrameSinkId& frame_sink_id,
+    const base::Optional<cc::LocalSurfaceId>& local_surface_id) {
+  display_added_count_++;
+}
+
 void TestWindowManager::WmDisplayRemoved(int64_t display_id) {
   got_display_removed_ = true;
   display_removed_id_ = display_id;
 }
 
 void TestWindowManager::WmSetModalType(uint32_t window_id, ui::ModalType type) {
   on_set_modal_type_called_ = true;
 }
 
 void TestWindowManager::WmCreateTopLevelWindow(
@@ skipping 297 matching lines @@
   window_server_delegate_.set_window_server(window_server_.get());
 }
 
 WindowServerTestHelper::~WindowServerTestHelper() {
   // Destroy |window_server_| while the message-loop is still alive.
   window_server_.reset();
 }
 
 // WindowEventTargetingHelper ------------------------------------------------
 
-WindowEventTargetingHelper::WindowEventTargetingHelper() {
+WindowEventTargetingHelper::WindowEventTargetingHelper(
+    bool automatically_create_display_roots) {
   display_ = new Display(window_server());
-  display_binding_ = new TestDisplayBinding(window_server());
+  display_binding_ = new TestDisplayBinding(window_server(),
+                                            automatically_create_display_roots);
   display_->Init(display::ViewportMetrics(),
                  base::WrapUnique(display_binding_));
   wm_client_ = ws_test_helper_.window_server_delegate()->last_client();
   wm_client_->tracker()->changes()->clear();
 }
 
 WindowEventTargetingHelper::~WindowEventTargetingHelper() {}
 
 ServerWindow* WindowEventTargetingHelper::CreatePrimaryTree(
     const gfx::Rect& root_window_bounds,
@@ skipping 54 matching lines @@
   *window = child1;
 }
 
 void WindowEventTargetingHelper::SetTaskRunner(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   base::MessageLoop::current()->SetTaskRunner(task_runner);
 }
 
 // ----------------------------------------------------------------------------
 
-void AddWindowManager(WindowServer* window_server, const UserId& user_id) {
+void AddWindowManager(WindowServer* window_server,
+                      const UserId& user_id,
+                      bool automatically_create_display_roots) {
   window_server->window_manager_window_tree_factory_set()
       ->Add(user_id, nullptr)
-      ->CreateWindowTree(nullptr, nullptr);
+      ->CreateWindowTree(nullptr, nullptr, automatically_create_display_roots);
 }
 
 display::Display MakeDisplay(int origin_x,
                              int origin_y,
                              int width_pixels,
                              int height_pixels,
                              float scale_factor) {
   gfx::Size scaled_size = gfx::ConvertSizeToDIP(
       scale_factor, gfx::Size(width_pixels, height_pixels));
   gfx::Rect bounds(gfx::Point(origin_x, origin_y), scaled_size);
@@ skipping 45 matching lines @@
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   if (client_id)
     *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui