Merge 236134 "Ensure that the first browser window which is crea..."

chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc

 // Copyright (c) 2012 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/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 74 matching lines @@
       new TestBrowserWindowAura(window));
   browser_window->CreateBrowser(params);
   return browser_window.Pass();
 }
 
 }  // namespace
 
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST_F(WindowSizerAshTest, DefaultSizeCase) {
+#if defined(OS_WIN)
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kOpenAsh);
+#endif
   { // 4:3 monitor case, 1024x768, no taskbar
     gfx::Rect window_bounds;
     GetWindowBounds(p1024x768, p1024x768, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, NULL, gfx::Rect(), &window_bounds);
     EXPECT_EQ(gfx::Rect(ash::WindowPositioner::kDesktopBorderSize,
                         ash::WindowPositioner::kDesktopBorderSize,
                         1024 - ash::WindowPositioner::kDesktopBorderSize * 2,
                         768 - ash::WindowPositioner::kDesktopBorderSize),
               window_bounds);
   }
@@ skipping 471 matching lines @@
       gfx::Rect(),                  // The second monitor.
       gfx::Rect(),                  // The (persisted) bounds.
       p1600x1200,                   // The overall work area.
       ui::SHOW_STATE_NORMAL,        // The persisted show state.
       ui::SHOW_STATE_DEFAULT,       // The last show state.
       DEFAULT,                      // No persisted values.
       browser.get(),                // Use this browser.
       gfx::Rect(),                  // Don't request valid bounds.
       &window_bounds,
       &out_show_state3);
+#if defined(OS_WIN)
+  EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, out_show_state3);
+#else
   EXPECT_EQ(ui::SHOW_STATE_DEFAULT, out_show_state3);
+#endif
 }
 
 #if defined(OS_CHROMEOS)
 #define MAYBE_PlaceNewWindowsOnMultipleDisplays PlaceNewWindowsOnMultipleDisplays
 #else
 // No multiple displays on windows ash.
 #define MAYBE_PlaceNewWindowsOnMultipleDisplays DISABLED_PlaceNewWindowsOnMultipleDisplays
 #endif
 
 // Test the placement of newly created windows on multiple dislays.
@@ skipping 194 matching lines @@
 
   // Create also a popup browser since that behaves slightly different for
   // defaults.
   scoped_ptr<TestBrowserWindowAura> browser_popup(CreateTestBrowserWindow(
       CreateTestWindowInShellWithId(1),
       gfx::Rect(16, 32, 128, 256),
       Browser::CreateParams(Browser::TYPE_POPUP, profile.get(),
                             chrome::HOST_DESKTOP_TYPE_ASH)));
 
   // Check that a browser creation state always get used if not given as
-  // SHOW_STATE_DEFAULT.
-  EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
-                               ui::SHOW_STATE_MAXIMIZED,
-                               DEFAULT,
-                               browser_window->browser(),
-                               p1600x1200), ui::SHOW_STATE_DEFAULT);
+  // SHOW_STATE_DEFAULT. On Windows ASH it should be SHOW_STATE_MAXIMIZED.
+  ui::WindowShowState window_show_state =
+      GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
+                         ui::SHOW_STATE_MAXIMIZED,
+                         DEFAULT,
+                         browser_window->browser(),
+                         p1600x1200);
+#if defined(OS_WIN)
+  EXPECT_EQ(window_show_state, ui::SHOW_STATE_MAXIMIZED);
+#else
+  EXPECT_EQ(window_show_state, ui::SHOW_STATE_DEFAULT);
+#endif
+
   browser_window->browser()->set_initial_show_state(ui::SHOW_STATE_MINIMIZED);
   EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
                                ui::SHOW_STATE_MAXIMIZED,
                                BOTH,
                                browser_window->browser(),
                                p1600x1200), ui::SHOW_STATE_MINIMIZED);
   browser_window->browser()->set_initial_show_state(ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
                                ui::SHOW_STATE_MAXIMIZED,
                                BOTH,
@@ skipping 17 matching lines @@
                                browser_window->browser(),
                                p1600x1200), ui::SHOW_STATE_MAXIMIZED);
 
   // The popup should favor the initial show state over the command line.
   EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL,
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                browser_popup->browser(),
                                p1600x1200), ui::SHOW_STATE_NORMAL);
 }