chromeos: convert remaining AshTest usage to AshTestBase

ash/mus/test/wm_test_base.cc

Index: ash/mus/test/wm_test_base.cc
diff --git a/ash/mus/test/wm_test_base.cc b/ash/mus/test/wm_test_base.cc
deleted file mode 100644
index eb0979fde201acb9403dec13f642dc4a8bceccf3..0000000000000000000000000000000000000000
--- a/ash/mus/test/wm_test_base.cc
+++ /dev/null
@@ -1,201 +0,0 @@
-// 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_base.h"
-
-#include <algorithm>
-#include <vector>
-
-#include "ash/display/window_tree_host_manager.h"
-#include "ash/mus/test/wm_test_helper.h"
-#include "ash/mus/top_level_window_factory.h"
-#include "ash/mus/window_manager.h"
-#include "ash/mus/window_manager_application.h"
-#include "ash/public/cpp/config.h"
-#include "ash/public/cpp/session_types.h"
-#include "ash/public/interfaces/session_controller.mojom.h"
-#include "ash/session/session_controller.h"
-#include "ash/shell.h"
-#include "ash/test/wm_window_test_api.h"
-#include "base/memory/ptr_util.h"
-#include "services/ui/public/cpp/property_type_converters.h"
-#include "ui/aura/mus/property_converter.h"
-#include "ui/aura/mus/window_tree_client.h"
-#include "ui/aura/window.h"
-#include "ui/compositor/scoped_animation_duration_scale_mode.h"
-#include "ui/display/display.h"
-#include "ui/display/manager/display_manager.h"
-
-namespace ash {
-namespace mus {
-namespace {
-
-ui::mojom::WindowType MusWindowTypeFromWmWindowType(
-    ui::wm::WindowType wm_window_type) {
-  switch (wm_window_type) {
-    case ui::wm::WINDOW_TYPE_UNKNOWN:
-      break;
-
-    case ui::wm::WINDOW_TYPE_NORMAL:
-      return ui::mojom::WindowType::WINDOW;
-
-    case ui::wm::WINDOW_TYPE_POPUP:
-      return ui::mojom::WindowType::POPUP;
-
-    case ui::wm::WINDOW_TYPE_CONTROL:
-      return ui::mojom::WindowType::CONTROL;
-
-    case ui::wm::WINDOW_TYPE_PANEL:
-      return ui::mojom::WindowType::PANEL;
-
-    case ui::wm::WINDOW_TYPE_MENU:
-      return ui::mojom::WindowType::MENU;
-
-    case ui::wm::WINDOW_TYPE_TOOLTIP:
-      return ui::mojom::WindowType::TOOLTIP;
-  }
-
-  NOTREACHED();
-  return ui::mojom::WindowType::CONTROL;
-}
-
-}  // namespace
-
-WmTestBase::WmTestBase() {}
-
-WmTestBase::~WmTestBase() {
-  CHECK(setup_called_)
-      << "You have overridden SetUp but never called WmTestBase::SetUp";
-  CHECK(teardown_called_)
-      << "You have overridden TearDown but never called WmTestBase::TearDown";
-}
-
-void WmTestBase::UpdateDisplay(const std::string& display_spec) {
-  test_helper_->UpdateDisplay(display_spec);
-}
-
-aura::Window* WmTestBase::GetPrimaryRootWindow() {
-  return Shell::Get()->GetPrimaryRootWindow();
-}
-
-aura::Window* WmTestBase::GetSecondaryRootWindow() {
-  if (Shell::GetAshConfig() == Config::MUS) {
-    return Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
-        GetSecondaryDisplay().id());
-  }
-
-  std::vector<RootWindowController*> roots =
-      test_helper_->GetRootsOrderedByDisplayId();
-  return roots.size() < 2 ? nullptr : roots[1]->GetRootWindow();
-}
-
-display::Display WmTestBase::GetPrimaryDisplay() {
-  if (Shell::GetAshConfig() == Config::MUS) {
-    return display::Screen::GetScreen()->GetDisplayNearestWindow(
-        Shell::Get()->GetPrimaryRootWindow());
-  }
-
-  std::vector<RootWindowController*> roots =
-      test_helper_->GetRootsOrderedByDisplayId();
-  DCHECK(!roots.empty());
-  return roots[0]->GetWindow()->GetDisplayNearestWindow();
-}
-
-display::Display WmTestBase::GetSecondaryDisplay() {
-  if (Shell::GetAshConfig() == Config::MUS)
-    return Shell::Get()->display_manager()->GetSecondaryDisplay();
-
-  std::vector<RootWindowController*> roots =
-      test_helper_->GetRootsOrderedByDisplayId();
-  return roots.size() < 2 ? display::Display()
-                          : roots[1]->GetWindow()->GetDisplayNearestWindow();
-}
-
-aura::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds) {
-  return CreateTestWindow(bounds, ui::wm::WINDOW_TYPE_NORMAL);
-}
-
-aura::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds,
-                                           ui::wm::WindowType window_type) {
-  std::map<std::string, std::vector<uint8_t>> properties;
-  if (!bounds.IsEmpty()) {
-    properties[ui::mojom::WindowManager::kBounds_InitProperty] =
-        mojo::ConvertTo<std::vector<uint8_t>>(bounds);
-  }
-
-  properties[ui::mojom::WindowManager::kResizeBehavior_Property] =
-      mojo::ConvertTo<std::vector<uint8_t>>(
-          static_cast<aura::PropertyConverter::PrimitiveType>(
-              ui::mojom::kResizeBehaviorCanResize |
-              ui::mojom::kResizeBehaviorCanMaximize |
-              ui::mojom::kResizeBehaviorCanMinimize));
-
-  const ui::mojom::WindowType mus_window_type =
-      MusWindowTypeFromWmWindowType(window_type);
-  WindowManager* window_manager =
-      test_helper_->window_manager_app()->window_manager();
-  aura::Window* window = CreateAndParentTopLevelWindow(
-      window_manager, mus_window_type, &properties);
-  window->Show();
-  return window;
-}
-
-aura::Window* WmTestBase::CreateChildTestWindow(aura::Window* parent,
-                                                const gfx::Rect& bounds) {
-  std::map<std::string, std::vector<uint8_t>> properties;
-  aura::Window* window = new aura::Window(nullptr);
-  window->Init(ui::LAYER_TEXTURED);
-  window->SetBounds(bounds);
-  window->Show();
-  parent->AddChild(window);
-  return window;
-}
-
-void WmTestBase::SetUp() {
-  setup_called_ = true;
-  // Disable animations during tests.
-  zero_duration_mode_ = base::MakeUnique<ui::ScopedAnimationDurationScaleMode>(
-      ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
-  // Most tests expect a minimum size of 0x0.
-  minimum_size_lock_ =
-      base::MakeUnique<WmWindowTestApi::GlobalMinimumSizeLock>();
-  test_helper_.reset(new WmTestHelper);
-  test_helper_->Init();
-
-  // Most tests assume the user is logged in (and hence the shelf is created).
-  SimulateUserLogin();
-}
-
-void WmTestBase::TearDown() {
-  teardown_called_ = true;
-  test_helper_.reset();
-  minimum_size_lock_.reset();
-  zero_duration_mode_.reset();
-}
-
-void WmTestBase::SimulateUserLogin() {
-  SessionController* session_controller = Shell::Get()->session_controller();
-
-  // Simulate the first user logging in.
-  mojom::UserSessionPtr session = mojom::UserSession::New();
-  session->session_id = 1;
-  session->type = user_manager::USER_TYPE_REGULAR;
-  const std::string email("ash.user@example.com");
-  session->account_id = AccountId::FromUserEmail(email);
-  session->display_name = "Ash User";
-  session->display_email = email;
-  session_controller->UpdateUserSession(std::move(session));
-
-  // Simulate the user session becoming active.
-  mojom::SessionInfoPtr info = mojom::SessionInfo::New();
-  info->can_lock_screen = true;
-  info->should_lock_screen_automatically = false;
-  info->add_user_session_policy = AddUserSessionPolicy::ALLOWED;
-  info->state = session_manager::SessionState::ACTIVE;
-  session_controller->SetSessionInfo(std::move(info));
-}
-
-
-}  // namespace mus
-}  // namespace ash