Move even more from WmShell to Shell

ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_window_manager.h"
 
 #include <string>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 67 matching lines @@
     aura::Window* window = widget->GetNativeWindow();
     window->SetBounds(bounds);
     window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
 
     return window;
   }
 
   // Create the Maximized mode window manager.
   MaximizeModeWindowManager* CreateMaximizeModeWindowManager() {
     EXPECT_FALSE(maximize_mode_window_manager());
-    WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+    Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
         true);
     return maximize_mode_window_manager();
   }
 
   // Destroy the maximized mode window manager.
   void DestroyMaximizeModeWindowManager() {
-    WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+    Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
         false);
     EXPECT_FALSE(maximize_mode_window_manager());
   }
 
   // Get the maximze window manager.
   MaximizeModeWindowManager* maximize_mode_window_manager() {
-    return WmShell::Get()
+    return Shell::Get()
         ->maximize_mode_controller()
         ->maximize_mode_window_manager_.get();
   }
 
   // Resize our desktop.
   void ResizeDesktop(int width_delta) {
     gfx::Size size =
         display::Screen::GetScreen()
             ->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow())
             .size();
@@ skipping 651 matching lines @@
   std::unique_ptr<aura::Window> w3(
       CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
   std::unique_ptr<aura::Window> w4(
       CreateFixedSizeNonMaximizableWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
   std::unique_ptr<aura::Window> w5(
       CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
 
   // The windows should be in the reverse order of creation in the MRU list.
   {
     aura::Window::Windows windows = WmWindow::ToAuraWindows(
-        WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+        Shell::Get()->mru_window_tracker()->BuildMruWindowList());
 
     EXPECT_EQ(w1.get(), windows[4]);
     EXPECT_EQ(w2.get(), windows[3]);
     EXPECT_EQ(w3.get(), windows[2]);
     EXPECT_EQ(w4.get(), windows[1]);
     EXPECT_EQ(w5.get(), windows[0]);
   }
 
   // Activating the window manager should keep the order.
   MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
   ASSERT_TRUE(manager);
   EXPECT_EQ(5, manager->GetNumberOfManagedWindows());
   {
     aura::Window::Windows windows = WmWindow::ToAuraWindows(
-        WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+        Shell::Get()->mru_window_tracker()->BuildMruWindowList());
     // We do not test maximization here again since that was done already.
     EXPECT_EQ(w1.get(), windows[4]);
     EXPECT_EQ(w2.get(), windows[3]);
     EXPECT_EQ(w3.get(), windows[2]);
     EXPECT_EQ(w4.get(), windows[1]);
     EXPECT_EQ(w5.get(), windows[0]);
   }
 
   // Destroying should still keep the order.
   DestroyMaximizeModeWindowManager();
   {
     aura::Window::Windows windows = WmWindow::ToAuraWindows(
-        WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+        Shell::Get()->mru_window_tracker()->BuildMruWindowList());
     // We do not test maximization here again since that was done already.
     EXPECT_EQ(w1.get(), windows[4]);
     EXPECT_EQ(w2.get(), windows[3]);
     EXPECT_EQ(w3.get(), windows[2]);
     EXPECT_EQ(w4.get(), windows[1]);
     EXPECT_EQ(w5.get(), windows[0]);
   }
 }
 
 // Check that a restore state change does always restore to maximized.
@@ skipping 13 matching lines @@
   DestroyMaximizeModeWindowManager();
 }
 
 // Check that minimize and restore do the right thing.
 TEST_F(MaximizeModeWindowManagerTest, TestMinimize) {
   gfx::Rect rect(10, 10, 100, 100);
   std::unique_ptr<aura::Window> window(
       CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
   wm::WindowState* window_state = wm::GetWindowState(window.get());
   EXPECT_EQ(rect.ToString(), window->bounds().ToString());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(window_state->IsMaximized());
   EXPECT_FALSE(window_state->IsMinimized());
   EXPECT_TRUE(window->IsVisible());
 
   window_state->Minimize();
   EXPECT_FALSE(window_state->IsMaximized());
   EXPECT_TRUE(window_state->IsMinimized());
   EXPECT_FALSE(window->IsVisible());
 
   window_state->Maximize();
   EXPECT_TRUE(window_state->IsMaximized());
   EXPECT_FALSE(window_state->IsMinimized());
   EXPECT_TRUE(window->IsVisible());
 
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(window_state->IsMaximized());
   EXPECT_FALSE(window_state->IsMinimized());
   EXPECT_TRUE(window->IsVisible());
 }
 
 // Check that a full screen window remains full screen upon entering maximize
 // mode. Furthermore, checks that this window is not full screen upon exiting
 // maximize mode if it was un-full-screened while in maximize mode.
 TEST_F(MaximizeModeWindowManagerTest, KeepFullScreenModeOn) {
@@ skipping 365 matching lines @@
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 5);
   RunAllPendingInMessageLoop();
   generator.ReleaseLeftButton();
   gfx::Point first_dragged_origin = window->bounds().origin();
   EXPECT_EQ(rect.x() + 10, first_dragged_origin.x());
   EXPECT_EQ(rect.y() + 5, first_dragged_origin.y());
 
   // 2. Check that turning on the manager will stop allowing the window from
   // dragging.
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   gfx::Rect center_bounds(window->bounds());
   EXPECT_NE(rect.origin().ToString(), center_bounds.origin().ToString());
   generator.MoveMouseTo(
       gfx::Point(center_bounds.x() + 1, center_bounds.y() + 1));
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 5);
   RunAllPendingInMessageLoop();
   generator.ReleaseLeftButton();
   EXPECT_EQ(center_bounds.x(), window->bounds().x());
   EXPECT_EQ(center_bounds.y(), window->bounds().y());
-  WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
 
   // 3. Releasing the mazimize manager again will restore the window to its
   // previous bounds and
   generator.MoveMouseTo(
       gfx::Point(first_dragged_origin.x() + 1, first_dragged_origin.y() + 1));
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 5);
   RunAllPendingInMessageLoop();
   generator.ReleaseLeftButton();
@@ skipping 457 matching lines @@
   EXPECT_EQ(1, observer.GetPostCountAndReset());
   EXPECT_EQ(wm::WINDOW_STATE_TYPE_MINIMIZED,
             observer.GetLastOldStateAndReset());
 
   window_state->RemoveObserver(&observer);
 
   DestroyMaximizeModeWindowManager();
 }
 
 }  // namespace ash