mus: Changes SetDisplayRoot() to create actual display

services/ui/ws/test_utils.h

Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index bc7d52d85eb680a5af8e4e3932a05f40aabf26b9..12de45fbe3a7ba60271f1aeb1c09ceed686e7d25 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -127,9 +127,12 @@ class WindowTreeTestApi {
   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:
@@ -590,6 +593,7 @@ class TestWindowServerDelegate : public WindowServerDelegate {
       mojom::WindowTreeRequest* tree_request,
       mojom::WindowTreeClientPtr* client) override;
   bool IsTestConfig() const override;
+  display::ScreenBase* GetScreen() override;
 
  private:
   WindowServer* window_server_ = nullptr;
@@ -597,6 +601,7 @@ class TestWindowServerDelegate : public WindowServerDelegate {
   // 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);
 };