mash: Migrate ShellDelegate ownership and access to WmShell.

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/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.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"
@@ skipping 145 matching lines @@
 // maximized mode for low and high resolution when this policy is set.
 TEST_P(WindowPositionerTest, FirstRunMaximizeWindowHighResloution) {
   const int width = ash::WindowPositioner::GetForceMaximizedWidthLimit() + 100;
   // Set resolution to 1466x300.
   const std::string resolution = base::IntToString(width) + "x300";
   UpdateDisplay(resolution);
   gfx::Rect bounds_in_out(0, 0, 320, 240);  // Random bounds.
   ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;
 
   test::TestShellDelegate* const delegate =
-      static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
+      static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
   delegate->SetForceMaximizeOnFirstRun(true);
 
   WindowPositioner::GetBoundsAndShowStateForNewWindow(
       nullptr, false, ui::SHOW_STATE_DEFAULT, &bounds_in_out, &show_state_out);
 
   EXPECT_EQ(show_state_out, ui::SHOW_STATE_MAXIMIZED);
 }
 
 // For detail see description of FirstRunMaximizeWindowHighResloution.
 TEST_P(WindowPositionerTest, FirstRunMaximizeWindowLowResolution) {
   const int width = ash::WindowPositioner::GetForceMaximizedWidthLimit() - 100;
   // Set resolution to 1266x300.
   const std::string resolution = base::IntToString(width) + "x300";
   UpdateDisplay(resolution);
   gfx::Rect bounds_in_out(0, 0, 320, 240);  // Random bounds.
   ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;
 
   test::TestShellDelegate* const delegate =
-      static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
+      static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
   delegate->SetForceMaximizeOnFirstRun(true);
 
   WindowPositioner::GetBoundsAndShowStateForNewWindow(
       nullptr, false, ui::SHOW_STATE_DEFAULT, &bounds_in_out, &show_state_out);
 
   EXPECT_EQ(show_state_out, ui::SHOW_STATE_MAXIMIZED);
 }
 
 TEST_P(WindowPositionerTest, IgnoreFullscreenInAutoRearrange) {
   if (!SupportsHostWindowResize())
@@ skipping 24 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