Centralizes more shared code between ash and mash

ash/mus/test/wm_test_helper.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 "ash/mus/test/wm_test_helper.h"
 
 #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/window_manager.h"
@@ skipping 86 matching lines @@
       window_manager_app_->window_manager_.get(),
       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");
+  int next_x = 0;
+  CreateRootWindowController("800x600", &next_x);
 }
 
 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();
+  int next_x = 0;
   for (size_t i = 0,
               end = std::min(parts.size(), root_window_controllers.size());
        i < end; ++i) {
-    UpdateDisplay(root_window_controllers[i], parts[i]);
+    UpdateDisplay(root_window_controllers[i], parts[i], &next_x);
   }
-  for (size_t i = root_window_controllers.size(); i < parts.size(); ++i)
-    root_window_controllers.push_back(CreateRootWindowController(parts[i]));
+  for (size_t i = root_window_controllers.size(); i < parts.size(); ++i) {
+    root_window_controllers.push_back(
+        CreateRootWindowController(parts[i], &next_x));
+  }
   while (root_window_controllers.size() > parts.size()) {
     window_manager_app_->window_manager()->DestroyRootWindowController(
         root_window_controllers.back());
     root_window_controllers.pop_back();
   }
 }
 
 RootWindowController* WmTestHelper::CreateRootWindowController(
-    const std::string& display_spec) {
-  display::Display display(next_display_id_++,
-                           ParseDisplayBounds(display_spec));
+    const std::string& display_spec,
+    int* next_x) {
+  gfx::Rect bounds = ParseDisplayBounds(display_spec);
+  bounds.set_x(*next_x);
+  *next_x += bounds.size().width();
+  display::Display display(next_display_id_++, bounds);
   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();
 }
 
 void WmTestHelper::UpdateDisplay(RootWindowController* root_window_controller,
-                                 const std::string& display_spec) {
+                                 const std::string& display_spec,
+                                 int* next_x) {
   gfx::Rect bounds = ParseDisplayBounds(display_spec);
+  bounds.set_y(*next_x);

[James Cook, 2016/09/21 22:03:19]

set_y ?

[sky, 2016/09/21 22:47:49]

Done.

+  *next_x += bounds.size().width();
   root_window_controller->display_.set_bounds(bounds);
   gfx::Rect work_area(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));
   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
 }  // namespace ash