Index: ash/accelerators/accelerator_controller_unittest.cc |
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc |
index fca81ff9cb343ddf3b3873c2253094dbfe056688..f8a3b3d2dcd0788970019171599d2a4537a44c0b 100644 |
--- a/ash/accelerators/accelerator_controller_unittest.cc |
+++ b/ash/accelerators/accelerator_controller_unittest.cc |
@@ -450,33 +450,20 @@ TEST_F(AcceleratorControllerTest, WindowSnap) { |
{ |
gfx::Rect normal_bounds = window->bounds(); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy); |
- EXPECT_TRUE(wm::IsWindowMaximized(window.get())); |
- EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString()); |
- |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy); |
- EXPECT_TRUE(wm::IsWindowMaximized(window.get())); |
- EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString()); |
- |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy); |
EXPECT_FALSE(wm::IsWindowMaximized(window.get())); |
EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString()); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy); |
+ ash::wm::MaximizeWindow(window.get()); |
+ EXPECT_TRUE(wm::IsWindowMaximized(window.get())); |
GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy); |
EXPECT_FALSE(wm::IsWindowMaximized(window.get())); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy); |
+ ash::wm::MaximizeWindow(window.get()); |
+ EXPECT_TRUE(wm::IsWindowMaximized(window.get())); |
GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy); |
EXPECT_FALSE(wm::IsWindowMaximized(window.get())); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy); |
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy); |
+ ash::wm::MaximizeWindow(window.get()); |
EXPECT_TRUE(wm::IsWindowMaximized(window.get())); |
GetController()->PerformAction(WINDOW_MINIMIZE, dummy); |
EXPECT_FALSE(wm::IsWindowMaximized(window.get())); |