Remove docked windows entirely in M59.

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 1569 matching lines @@
   // The always-on-top windows should not change when leaving maximize mode.
   DestroyMaximizeModeWindowManager();
   EXPECT_FALSE(wm::GetWindowState(w1.get())->IsMaximized());
   EXPECT_FALSE(wm::GetWindowState(w2.get())->IsMaximized());
   EXPECT_EQ(rect1.ToString(), w1->bounds().ToString());
   EXPECT_EQ(rect2.ToString(), w2->bounds().ToString());
   EXPECT_TRUE(wm::GetWindowState(w1.get())->can_be_dragged());
   EXPECT_TRUE(wm::GetWindowState(w2.get())->can_be_dragged());
 }
 
-// Tests that docked windows are not maximized, and not tracked.
-TEST_F(MaximizeModeWindowManagerTest, DontMaximizeDockedWindows) {
-  // Enable window docking for this test.
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      ash::switches::kAshEnableDockedWindows);
-
-  gfx::Rect rect(10, 10, 200, 50);
-  std::unique_ptr<aura::Window> window(
-      CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
-
-  wm::WMEvent dock_event(wm::WM_EVENT_DOCK);
-  wm::GetWindowState(window.get())->OnWMEvent(&dock_event);
-  EXPECT_TRUE(wm::GetWindowState(window.get())->IsDocked());
-  EXPECT_FALSE(wm::GetWindowState(window.get())->IsMaximized());
-
-  MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
-  EXPECT_TRUE(wm::GetWindowState(window.get())->IsDocked());
-  EXPECT_FALSE(wm::GetWindowState(window.get())->IsMaximized());
-  EXPECT_EQ(0, manager->GetNumberOfManagedWindows());
-}
-
 // Tests that windows that can control maximized bounds are not maximized
 // and not tracked.
 TEST_F(MaximizeModeWindowManagerTest, DontMaximizeClientManagedWindows) {
   gfx::Rect rect(10, 10, 200, 50);
   std::unique_ptr<aura::Window> window(
       CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
 
   wm::GetWindowState(window.get())->set_allow_set_bounds_in_maximized(true);
 
   MaximizeModeWindowManager* manager = CreateMaximizeModeWindowManager();
@@ skipping 97 matching lines @@
   EXPECT_EQ(1, observer.GetPostCountAndReset());
   EXPECT_EQ(wm::WINDOW_STATE_TYPE_MINIMIZED,
             observer.GetLastOldStateAndReset());
 
   window_state->RemoveObserver(&observer);
 
   DestroyMaximizeModeWindowManager();
 }
 
 }  // namespace ash