Hide docked windows behind a flag

chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

 // Copyright (c) 2015 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 "chrome/browser/ui/views/frame/browser_view.h"
 
+#include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/views/focus/focus_manager.h"
 
+#if defined(USE_ASH)
+#include "ash/common/ash_switches.h"
+#endif
+
 #if defined(USE_AURA)
 #include "chrome/browser/ui/browser_window_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #endif
 
 using views::FocusManager;
@@ skipping 28 matching lines @@
                              public testing::WithParamInterface<bool> {
  public:
   bool TestApp() { return GetParam(); }
 };
 
 }  // namespace
 
 // Test that docked state is remembered for app browser windows and not
 // remembered for tabbed browser windows.
 IN_PROC_BROWSER_TEST_P(BrowserViewTestParam, BrowserRemembersDockedState) {
+#if defined(USE_ASH)
+  // Enable window docking for this test.
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      ash::switches::kAshEnableDockedWindows);
+  const bool kIsAsh = true;
+#else
+  const bool kIsAsh = false;
+#endif  // defined(USE_ASH)
+
   // Open a new browser window (app or tabbed depending on a parameter).
   bool test_app = TestApp();
   Browser::CreateParams params =
       test_app ? Browser::CreateParams::CreateForApp(
                      "test_browser_app", true /* trusted_source */, gfx::Rect(),
                      browser()->profile())
                : Browser::CreateParams(browser()->profile());
   params.initial_show_state = ui::SHOW_STATE_DEFAULT;
-#if defined(USE_ASH)
-  const bool kIsAsh = true;
-#else
-  const bool kIsAsh = false;
-#endif
+
   // Default |browser()| is not used by this test.
   browser()->window()->Close();
 
   // Create a new app browser
   Browser* browser = new Browser(params);
   ASSERT_TRUE(browser);
   gfx::NativeWindow window = browser->window()->GetNativeWindow();
   gfx::Rect original_bounds(gfx::Rect(150, 250, 400, 100));
   window->SetBounds(original_bounds);
   window->Show();
@@ skipping 68 matching lines @@
   window = browser->window()->GetNativeWindow();
   EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL,
             window->GetProperty(aura::client::kShowStateKey));
 }
 
 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp,
                         BrowserViewTestParam,
                         testing::Bool());
 #endif