Converts ash to use aura-mus

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/common/test/test_new_window_client.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/root_window_controller.h"
+#include "ash/mus/screen_mus.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"
-#include "services/ui/public/cpp/window_tree_client.h"
+#include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/test/env_test_helper.h"
+#include "ui/aura/test/mus/window_tree_client_private.h"
+#include "ui/aura/window.h"
 #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"
 #include "ui/views/test/test_views_delegate.h"
 
 namespace ash {
 namespace mus {
 namespace {
@@ skipping 62 matching lines @@
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlockingForTesting";
   blocking_pool_owner_ = base::MakeUnique<base::SequencedWorkerPoolOwner>(
       kMaxNumberThreads, kThreadNamePrefix);
 
   window_manager_app_->window_manager_.reset(new WindowManager(nullptr));
 
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
       window_manager_app_->window_manager_.get());
+  aura::test::EnvTestHelper().SetWindowTreeClient(
+      window_tree_client_setup_.window_tree_client());
   window_manager_app_->InitWindowManager(
       window_tree_client_setup_.OwnWindowTreeClient(),
       blocking_pool_owner_->pool());
 
   // TODO(jamescook): Pass a TestShellDelegate into WindowManager and use it to
   // create the various test delegates.
   WmShellTestApi().SetSystemTrayDelegate(
       base::MakeUnique<test::TestSystemTrayDelegate>());
   WmShellTestApi().SetNewWindowClient(base::MakeUnique<TestNewWindowClient>());
 
-  ui::WindowTreeClient* window_tree_client =
+  aura::WindowTreeClient* window_tree_client =
       window_manager_app_->window_manager()->window_tree_client();
   window_tree_client_private_ =
-      base::MakeUnique<ui::WindowTreeClientPrivate>(window_tree_client);
+      base::MakeUnique<aura::WindowTreeClientPrivate>(window_tree_client);
   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);
@@ skipping 42 matching lines @@
                                  const std::string& display_spec,
                                  int* next_x) {
   gfx::Rect bounds = ParseDisplayBounds(display_spec);
   bounds.set_x(*next_x);
   *next_x += bounds.size().width();
   gfx::Insets work_area_insets =
       root_window_controller->display_.GetWorkAreaInsets();
   root_window_controller->display_.set_bounds(bounds);
   root_window_controller->display_.UpdateWorkAreaFromInsets(work_area_insets);
   root_window_controller->root()->SetBounds(gfx::Rect(bounds.size()));
-  display::ScreenBase* screen =
-      window_manager_app_->window_manager()->screen_.get();
+  ScreenMus* 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