Move MaximizeModeWindowManager to the controller

ash/display/virtual_keyboard_window_controller_unittest.cc

Index: ash/display/virtual_keyboard_window_controller_unittest.cc
diff --git a/ash/display/virtual_keyboard_window_controller_unittest.cc b/ash/display/virtual_keyboard_window_controller_unittest.cc
index fdb01f075f6326227d47a546201cc2bb0f022385..e2538c1e5b74e21881e42c52c5504efb3e8c4261 100644
--- a/ash/display/virtual_keyboard_window_controller_unittest.cc
+++ b/ash/display/virtual_keyboard_window_controller_unittest.cc
@@ -10,6 +10,7 @@
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/command_line.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
@@ -84,9 +85,11 @@ TEST_F(VirtualKeyboardWindowControllerTest, EnabledDuringMaximizeMode) {
           virtual_keyboard_window_controller());
 
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
-  Shell::GetInstance()->EnableMaximizeModeWindowManager(true);
+  Shell::GetInstance()->maximize_mode_controller()->
+      EnableMaximizeModeWindowManager(true);
   EXPECT_TRUE(keyboard::IsKeyboardEnabled());
-  Shell::GetInstance()->EnableMaximizeModeWindowManager(false);
+  Shell::GetInstance()->maximize_mode_controller()->
+      EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
 }