Hide docked windows behind a flag

ash/wm/overview/window_selector_unittest.cc

Index: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 915d25316c1425182c6740066d17f768ae5711cf..7de3a496e52e7681ba11c71b43b0f44e4084bc6d 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -546,8 +546,24 @@ TEST_F(WindowSelectorTest, WindowsOrder) {
   ToggleOverview();
 }
 
+// Test class used for tests that need docked windows enabled.
+class EnabledDockedWindowsWindowSelectorTest : public WindowSelectorTest {
+ public:
+  EnabledDockedWindowsWindowSelectorTest() = default;
+  ~EnabledDockedWindowsWindowSelectorTest() override = default;
+
+  void SetUp() override {
+    base::CommandLine::ForCurrentProcess()->AppendSwitch(
+        ash::switches::kAshEnableDockedWindows);
+    WindowSelectorTest::SetUp();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(EnabledDockedWindowsWindowSelectorTest);
+};
+
 // Tests entering overview mode with docked windows
-TEST_F(WindowSelectorTest, BasicWithDocked) {
+TEST_F(EnabledDockedWindowsWindowSelectorTest, BasicWithDocked) {
   // aura::Window* root_window = Shell::GetPrimaryRootWindow();
   gfx::Rect bounds(300, 0, 200, 200);
   std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
@@ -621,7 +637,7 @@ TEST_F(WindowSelectorTest, BasicWithDocked) {
 
 // Tests that selecting a docked window updates docked layout pushing another
 // window to get docked-minimized.
-TEST_F(WindowSelectorTest, ActivateDockedWindow) {
+TEST_F(EnabledDockedWindowsWindowSelectorTest, ActivateDockedWindow) {
   // aura::Window* root_window = Shell::GetPrimaryRootWindow();
   gfx::Rect bounds(300, 0, 200, 200);
   std::unique_ptr<views::Widget> widget1 = CreateWindowWidget(bounds);
@@ -687,7 +703,7 @@ TEST_F(WindowSelectorTest, ActivateDockedWindow) {
 }
 
 // Tests that clicking on the close button closes the docked window.
-TEST_F(WindowSelectorTest, CloseDockedWindow) {
+TEST_F(EnabledDockedWindowsWindowSelectorTest, CloseDockedWindow) {
   // aura::Window* root_window = Shell::GetPrimaryRootWindow();
   gfx::Rect bounds(300, 0, 200, 200);
   std::unique_ptr<views::Widget> widget1 = CreateWindowWidget(bounds);
@@ -750,7 +766,7 @@ TEST_F(WindowSelectorTest, CloseDockedWindow) {
 }
 
 // Tests that clicking on the close button closes the docked-minimized window.
-TEST_F(WindowSelectorTest, CloseDockedMinimizedWindow) {
+TEST_F(EnabledDockedWindowsWindowSelectorTest, CloseDockedMinimizedWindow) {
   // aura::Window* root_window = Shell::GetPrimaryRootWindow();
   gfx::Rect bounds(300, 0, 200, 200);
   std::unique_ptr<views::Widget> widget1 = CreateWindowWidget(bounds);