mus: Changes SetDisplayRoot() to create actual display

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 109 matching lines @@
   void AckLastAccelerator(
       mojom::EventResult result,
       const std::unordered_map<std::string, std::vector<uint8_t>>& properties =
           std::unordered_map<std::string, std::vector<uint8_t>>()) {
     tree_->OnAcceleratorAck(tree_->event_ack_id_, result, properties);
   }
 
   void StartPointerWatcher(bool want_moves);
   void StopPointerWatcher();
 
-  bool ProcessSetDisplayRoot(int64_t display_id,
+  bool ProcessSetDisplayRoot(const display::Display& display_to_create,
+                             const mojom::WmViewportMetrics& viewport_metrics,
+                             bool is_primary_display,
                              const ClientWindowId& client_window_id) {
-    return tree_->ProcessSetDisplayRoot(display_id, client_window_id);
+    return tree_->ProcessSetDisplayRoot(display_to_create, viewport_metrics,
+                                        is_primary_display, client_window_id);
   }
 
  private:
   WindowTree* tree_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi);
 };
 
 // -----------------------------------------------------------------------------
 
@@ skipping 440 matching lines @@
   // WindowServerDelegate:
   void StartDisplayInit() override;
   void OnNoMoreDisplays() override;
   std::unique_ptr<WindowTreeBinding> CreateWindowTreeBinding(
       BindingType type,
       ws::WindowServer* window_server,
       ws::WindowTree* tree,
       mojom::WindowTreeRequest* tree_request,
       mojom::WindowTreeClientPtr* client) override;
   bool IsTestConfig() const override;
+  display::ScreenBase* GetScreen() override;
 
  private:
   WindowServer* window_server_ = nullptr;
   bool got_on_no_more_displays_ = false;
   // All TestWindowTreeBinding objects created via CreateWindowTreeBinding.
   // These are owned by the corresponding WindowTree.
   std::vector<TestWindowTreeBinding*> bindings_;
+  std::unique_ptr<display::ScreenBase> screen_;

[kylechar, 2017/04/19 18:06:08]

TestScreenManager also creates a ScreenBase so some tests will end up with two
of them I think? This isn't installing it as the singleton, so no crashes, but
it might be confusing.

[sky, 2017/04/19 19:30:03]

Removed.

 
   DISALLOW_COPY_AND_ASSIGN(TestWindowServerDelegate);
 };
 
 // -----------------------------------------------------------------------------
 
 // Helper class which creates and sets up the necessary objects for tests that
 // use the WindowServer.
 class WindowServerTestHelper {
  public:
@@ skipping 104 matching lines @@
                               ClientWindowId* client_id = nullptr);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id = nullptr);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_