mash: Migrate ScopedTargetRootWindow to //ash/common

ash/wm/window_positioner_unittest.cc

 // Copyright 2013 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/common/wm/window_positioner.h"
 
 #include <string>
 
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/scoped_root_window_for_new_windows.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/ash_md_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/strings/string_number_conversions.h"
-#include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 using WindowPositionerTest = test::AshMDTestBase;
 
 INSTANTIATE_TEST_CASE_P(
     /* prefix intentionally left blank due to only one parameterization */,
     WindowPositionerTest,
     testing::Values(MaterialDesignController::NON_MATERIAL,
                     MaterialDesignController::MATERIAL_NORMAL,
                     MaterialDesignController::MATERIAL_EXPERIMENTAL));
 
 TEST_P(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) {
   if (!SupportsMultipleDisplays())
     return;
   const int height_offset = GetMdMaximizedWindowHeightOffset();
   // Tests that for a screen that is narrower than kForceMaximizeWidthLimit
   // a new window gets maximized.
   UpdateDisplay("400x400,500x500");
-  Shell::GetInstance()->set_target_root_window(Shell::GetAllRootWindows()[1]);
+  ScopedRootWindowForNewWindows root_for_new_windows(
+      WmShell::Get()->GetAllRootWindows()[1]);
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
   EXPECT_EQ(gfx::Rect(400, 0, 500, 453 + height_offset).ToString(),
             widget->GetWindowBoundsInScreen().ToString());
 }
 
 TEST_P(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 #if defined(OS_WIN)
   ash::WindowPositioner::SetMaximizeFirstWindow(true);
 #endif
   UpdateDisplay("400x400,1400x900");
-  aura::Window* second_root_window = Shell::GetAllRootWindows()[1];
-  Shell::GetInstance()->set_target_root_window(second_root_window);
+  WmWindow* second_root_window = WmShell::Get()->GetAllRootWindows()[1];
+  ScopedRootWindowForNewWindows root_for_new_windows(second_root_window);
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
   gfx::Rect bounds = widget->GetWindowBoundsInScreen();
 #if defined(OS_WIN)
   EXPECT_TRUE(widget->IsMaximized());
 #else
   // The window should be in the 2nd display with the default size.
   EXPECT_EQ("300x300", bounds.size().ToString());
 #endif
-  EXPECT_TRUE(display::Screen::GetScreen()
-                  ->GetDisplayNearestWindow(second_root_window)
-                  .bounds()
-                  .Contains(bounds));
+
+  EXPECT_TRUE(
+      second_root_window->GetDisplayNearestWindow().bounds().Contains(bounds));
 }
 
 // Tests that second window inherits first window's maximized state as well as
 // its restore bounds.
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #if defined(OS_CHROMEOS)
 TEST_P(WindowPositionerTest, SecondMaximizedWindowHasProperRestoreSize) {
   const int height_offset = GetMdMaximizedWindowHeightOffset();
   UpdateDisplay("1400x900");
   shell::ToplevelWindow::CreateParams params;
@@ skipping 147 matching lines @@
   widget1->SetFullscreen(false);
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 
   // Closing 2nd widget triggers the rearrange logic but the 1st
   // widget should stay in the current size.
   widget2->CloseNow();
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 }
 
 }  // namespace ash