Move AcceleratorCommandsBrowserTest.ToggleMaximized to ash_unittests

Bug: none
Change-Id: I6ff55d5042afdc992c7f94836cc7192e7b0cb749
Reviewed-on: https://chromium-review.googlesource.com/1188946Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586305}

ash/accelerators/accelerator_commands_unittest.cc

@@ -51,6 +51,31 @@ TEST_F(AcceleratorCommandsTest, ToggleMinimized) {
   EXPECT_TRUE(window_state1->IsActive());
 }
 
+TEST_F(AcceleratorCommandsTest, ToggleMaximized) {
+  std::unique_ptr<aura::Window> window(
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  window_state->Activate();
+
+  // When not in fullscreen, accelerators::ToggleMaximized toggles Maximized.
+  EXPECT_FALSE(window_state->IsMaximized());
+  accelerators::ToggleMaximized();
+  EXPECT_TRUE(window_state->IsMaximized());
+  accelerators::ToggleMaximized();
+  EXPECT_FALSE(window_state->IsMaximized());
+
+  // When in fullscreen accelerators::ToggleMaximized gets out of fullscreen.
+  EXPECT_FALSE(window_state->IsFullscreen());
+  accelerators::ToggleFullscreen();
+  EXPECT_TRUE(window_state->IsFullscreen());
+  accelerators::ToggleMaximized();
+  EXPECT_FALSE(window_state->IsFullscreen());
+  EXPECT_FALSE(window_state->IsMaximized());
+  accelerators::ToggleMaximized();
+  EXPECT_FALSE(window_state->IsFullscreen());
+  EXPECT_TRUE(window_state->IsMaximized());
+}
+
 TEST_F(AcceleratorCommandsTest, Unpin) {
   std::unique_ptr<aura::Window> window1(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));

chrome/browser/ui/ash/accelerator_commands_browsertest.cc

@@ -55,35 +55,6 @@ bool IsInImmersiveFullscreen(ash::wm::WindowState* window_state) {
 
 }  // namespace
 
-typedef InProcessBrowserTest AcceleratorCommandsBrowserTest;
-
-// Confirm that toggling window miximized works properly
-IN_PROC_BROWSER_TEST_F(AcceleratorCommandsBrowserTest, ToggleMaximized) {
-  ASSERT_TRUE(ash::Shell::HasInstance()) << "No Instance";
-  ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();
-  ASSERT_TRUE(window_state);
-
-  // When not in fullscreen, accelerators::ToggleMaximized toggles Maximized.
-  EXPECT_FALSE(window_state->IsMaximized());
-  ash::accelerators::ToggleMaximized();
-  EXPECT_TRUE(window_state->IsMaximized());
-  ash::accelerators::ToggleMaximized();
-  EXPECT_FALSE(window_state->IsMaximized());
-
-  // When in fullscreen accelerators::ToggleMaximized gets out of fullscreen.
-  EXPECT_FALSE(window_state->IsFullscreen());
-  Browser* browser = chrome::FindBrowserWithWindow(window_state->window());
-  ASSERT_TRUE(browser);
-  chrome::ToggleFullscreenMode(browser);
-  EXPECT_TRUE(window_state->IsFullscreen());
-  ash::accelerators::ToggleMaximized();
-  EXPECT_FALSE(window_state->IsFullscreen());
-  EXPECT_FALSE(window_state->IsMaximized());
-  ash::accelerators::ToggleMaximized();
-  EXPECT_FALSE(window_state->IsFullscreen());
-  EXPECT_TRUE(window_state->IsMaximized());
-}
-
 class AcceleratorCommandsFullscreenBrowserTest
     : public WithParamInterface<ui::WindowShowState>,
       public InProcessBrowserTest {

testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter

@@ -11,7 +11,6 @@
 -BrowserTabRestoreTest.*
 
 # Extensive use of ash::WindowState.
--AcceleratorCommandsBrowserTest.*
 -InitiallyMaximized/AcceleratorCommandsFullscreenBrowserTest.*
 -InitiallyMaximized/AcceleratorCommandsPlatformAppFullscreenBrowserTest.*
 -InitiallyRestored/AcceleratorCommandsFullscreenBrowserTest.*