Adds support for multiple displays to WmTestBase

ash/mus/test/wm_test_helper.cc

Index: ash/mus/test/wm_test_helper.cc
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
index 63a5c48093389013266ed71fa16f0b61267b663a..3c9efdad45ce94b8af1992d44de4ef4710262627 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -7,11 +7,12 @@
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/mus/root_window_controller.h"
-#include "ash/mus/test/wm_test_screen.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/tests/window_tree_client_private.h"
@@ -19,9 +20,49 @@
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/display/display.h"
+#include "ui/display/display_list.h"
+#include "ui/display/screen_base.h"
 
 namespace ash {
 namespace mus {
+namespace {
+
+bool CompareByDisplayId(const RootWindowController* root1,
+                        const RootWindowController* root2) {
+  return root1->display().id() < root2->display().id();
+}
+
+// TODO(sky): at some point this needs to support everything in DisplayInfo,
+// for now just the bare minimum, which is [x+y-]wxh.
+gfx::Rect ParseDisplayBounds(const std::string& spec) {
+  gfx::Rect bounds;
+  const std::vector<std::string> parts =
+      base::SplitString(spec, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::string size_spec;
+  if (parts.size() == 2u) {
+    size_spec = parts[1];
+    const std::vector<std::string> origin_parts = base::SplitString(
+        parts[0], "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    CHECK_EQ(2u, origin_parts.size());
+    int x, y;
+    CHECK(base::StringToInt(origin_parts[0], &x));
+    CHECK(base::StringToInt(origin_parts[1], &y));
+    bounds.set_origin(gfx::Point(x, y));
+  } else {
+    CHECK_EQ(1u, parts.size());
+    size_spec = spec;
+  }
+  const std::vector<std::string> size_parts = base::SplitString(
+      size_spec, "x", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  CHECK_EQ(2u, size_parts.size());
+  int w = 0, h = 0;
+  CHECK(base::StringToInt(size_parts[0], &w));
+  CHECK(base::StringToInt(size_parts[1], &h));
+  bounds.set_size(gfx::Size(w, h));
+  return bounds;
+}
+
+}  // namespace
 
 WmTestHelper::WmTestHelper() {}
 
@@ -51,33 +92,81 @@ void WmTestHelper::Init() {
       kMaxNumberThreads, kThreadNamePrefix);
 
   window_manager_app_->window_manager_.reset(new WindowManager(nullptr));
-  screen_ = new WmTestScreen;
-  window_manager_app_->window_manager_->screen_.reset(screen_);
 
-  // Need an id other than kInvalidDisplayID so the Display is considered valid.
-  display::Display display(1);
-  const gfx::Rect display_bounds(0, 0, 800, 600);
-  display.set_bounds(display_bounds);
-  // Offset the height slightly to give a different work area. -20 is arbitrary,
-  // it could be anything.
-  const gfx::Rect work_area(0, 0, display_bounds.width(),
-                            display_bounds.height() - 20);
-  display.set_work_area(work_area);
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
-      window_manager_app_->window_manager_.get(), display);
-
+      window_manager_app_->window_manager_.get());
   window_manager_app_->InitWindowManager(
       window_tree_client_setup_.OwnWindowTreeClient(),
       blocking_pool_owner_->pool());
+
   ui::WindowTreeClient* window_tree_client =
       window_manager_app_->window_manager()->window_tree_client();
+  window_tree_client_private_ =
+      base::MakeUnique<ui::WindowTreeClientPrivate>(window_tree_client);
+  CreateRootWindowController("800x600");
+}
+
+std::vector<RootWindowController*> WmTestHelper::GetRootsOrderedByDisplayId() {
+  std::set<RootWindowController*> roots =
+      window_manager_app_->window_manager()->GetRootWindowControllers();
+  std::vector<RootWindowController*> ordered_roots;
+  ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
+  std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
+  return ordered_roots;
+}
+
+void WmTestHelper::UpdateDisplay(const std::string& display_spec) {
+  const std::vector<std::string> parts = base::SplitString(
+      display_spec, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<RootWindowController*> root_window_controllers =
+      GetRootsOrderedByDisplayId();
+  for (size_t i = 0,
+              end = std::min(parts.size(), root_window_controllers.size());
+       i < end; ++i) {
+    UpdateDisplay(root_window_controllers[i], parts[i]);
+  }
+  for (size_t i = root_window_controllers.size(); i < parts.size(); ++i)
+    root_window_controllers.push_back(CreateRootWindowController(parts[i]));
+  while (root_window_controllers.size() > parts.size()) {
+    window_manager_app_->window_manager()->DestroyRootWindowController(
+        root_window_controllers.back());
+    root_window_controllers.pop_back();
+  }
+}
 
-  screen_->display_list()->AddDisplay(display,
-                                      display::DisplayList::Type::PRIMARY);
+RootWindowController* WmTestHelper::CreateRootWindowController(
+    const std::string& display_spec) {
+  display::Display display(next_display_id_++,
+                           ParseDisplayBounds(display_spec));
+  gfx::Rect work_area(display.bounds());
+  // Offset the height slightly to give a different work area. -20 is arbitrary,
+  // it could be anything.
+  work_area.set_height(std::max(0, work_area.height() - 20));
+  display.set_work_area(work_area);
+  window_tree_client_private_->CallWmNewDisplayAdded(display);
+  return GetRootsOrderedByDisplayId().back();
+}
 
-  ui::WindowTreeClientPrivate(window_tree_client)
-      .CallWmNewDisplayAdded(display);
+void WmTestHelper::UpdateDisplay(RootWindowController* root_window_controller,
+                                 const std::string& display_spec) {
+  gfx::Rect bounds = ParseDisplayBounds(display_spec);
+  root_window_controller->display_.set_bounds(bounds);
+  gfx::Rect work_area(bounds);
+  // Offset the height slightly to give a different work area. -2 is arbitrary,

[msw, 2016/09/12 23:19:48]

nit: -2 versus -20 above.

[sky, 2016/09/13 00:10:26]

Done.

+  // it could be anything.
+  work_area.set_height(std::max(0, work_area.height() - 2));
+  root_window_controller->display_.set_work_area(work_area);
+  root_window_controller->root()->SetBounds(gfx::Rect(bounds.size()));
+  display::ScreenBase* screen =
+      window_manager_app_->window_manager()->screen_.get();
+  const bool is_primary = screen->display_list()->FindDisplayById(
+                              root_window_controller->display().id()) ==
+                          screen->display_list()->GetPrimaryDisplayIterator();
+  screen->display_list()->UpdateDisplay(
+      root_window_controller->display(),
+      is_primary ? display::DisplayList::Type::PRIMARY
+                 : display::DisplayList::Type::NOT_PRIMARY);
 }
 
 }  // namespace mus