Removes ash::mus::RootWindowController

ash/mus/test/wm_test_base.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_base.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/wm_shell.h"
-#include "ash/mus/root_window_controller.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/session_types.h"
 #include "ash/public/interfaces/session_controller.mojom.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"
@@ skipping 49 matching lines @@
 }
 
 void WmTestBase::UpdateDisplay(const std::string& display_spec) {
   test_helper_->UpdateDisplay(display_spec);
 }
 
 aura::Window* WmTestBase::GetPrimaryRootWindow() {
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
   DCHECK(!roots.empty());
-  return roots[0]->root();
+  return roots[0]->GetRootWindow();
 }
 
 aura::Window* WmTestBase::GetSecondaryRootWindow() {
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
-  return roots.size() < 2 ? nullptr : roots[1]->root();
+  return roots.size() < 2 ? nullptr : roots[1]->GetRootWindow();
 }
 
 display::Display WmTestBase::GetPrimaryDisplay() {
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
   DCHECK(!roots.empty());
-  return roots[0]->display();
+  return roots[0]->GetWindow()->GetDisplayNearestWindow();

[msw, 2017/01/18 23:31:27]

q: does it matter if we call GetWindow vs. GetRootWindow here (and below)?

[sky, 2017/01/19 01:02:19]

They are the same thing, with different result values:
GetWindow() returns WmWindow
GetRootWindow() returns aura::Window
I have a TODO in RootWindowController to clean that up. As long as we have
WmWindow, the two return values are useful.

[msw, 2017/01/19 01:20:33]

Ah, I didn't notice the WmWindow/aura::Window return types. Gotcha

 }
 
 display::Display WmTestBase::GetSecondaryDisplay() {
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
-  return roots.size() < 2 ? display::Display() : roots[1]->display();
+  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);
-  aura::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
-                             ->window_manager()
-                             ->NewTopLevelWindow(mus_window_type, &properties);
+  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::CreateFullscreenTestWindow(int64_t display_id) {
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[ui::mojom::WindowManager::kShowState_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<aura::PropertyConverter::PrimitiveType>(
               ui::mojom::ShowState::FULLSCREEN));
   if (display_id != display::kInvalidDisplayId) {
     properties[ui::mojom::WindowManager::kDisplayId_InitProperty] =
         mojo::ConvertTo<std::vector<uint8_t>>(display_id);
   }
-  aura::Window* window =
-      test_helper_->GetRootsOrderedByDisplayId()[0]
-          ->window_manager()
-          ->NewTopLevelWindow(ui::mojom::WindowType::WINDOW, &properties);
+  WindowManager* window_manager =
+      test_helper_->window_manager_app()->window_manager();
+  aura::Window* window = CreateAndParentTopLevelWindow(
+      window_manager, ui::mojom::WindowType::WINDOW, &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);
@@ skipping 43 matching lines @@
   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