Ignoring alignment when it pushes a window out of the screen

chrome/browser/ui/window_sizer_aura_unittest.cc

Index: chrome/browser/ui/window_sizer_aura_unittest.cc
diff --git a/chrome/browser/ui/window_sizer_aura_unittest.cc b/chrome/browser/ui/window_sizer_aura_unittest.cc
index 3420f5cc5b3fcecd645809ac31ace423a5148538..6d86e5ada984f61accd1b06360d4e7e727d9c2cb 100644
--- a/chrome/browser/ui/window_sizer_aura_unittest.cc
+++ b/chrome/browser/ui/window_sizer_aura_unittest.cc
@@ -30,6 +30,14 @@ namespace {
 
 typedef ash::test::AshTestBase WindowSizerTest;
 
+// A function which aligns a size to a step within the grid.
+int align(int size, int alignment_factor) {
+  if (alignment_factor > 1) {
+    return size - size % alignment_factor;
+  }
+  return size;
+}
+
 // A special test class for use with browser creation - it will create a
 // browser thread and deletes it after all other things have been destroyed.
 class WindowSizerTestWithBrowser : public WindowSizerTest {
@@ -83,8 +91,8 @@ TestBrowserWindowAura::~TestBrowserWindowAura() {}
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST_F(WindowSizerTest, DefaultSizeCase) {
-  EXPECT_EQ(WindowSizer::kDesktopBorderSize,
-            ash::Shell::GetInstance()->GetGridSize());
+  int grid = ash::Shell::GetInstance()->GetGridSize();
+  EXPECT_EQ(WindowSizer::kDesktopBorderSize, grid);
   { // 4:3 monitor case, 1024x768, no taskbar
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
@@ -103,9 +111,9 @@ TEST_F(WindowSizerTest, DefaultSizeCase) {
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
-                        (taskbar_bottom_work_area.height() -
-                            WindowSizer::kDesktopBorderSize)),
-              window_bounds);
+                        align(taskbar_bottom_work_area.height() -
+                              WindowSizer::kDesktopBorderSize, grid)),
+                        window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on right
@@ -114,8 +122,8 @@ TEST_F(WindowSizerTest, DefaultSizeCase) {
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        taskbar_right_work_area.width() -
-                          WindowSizer::kDesktopBorderSize*2,
+                        align(taskbar_right_work_area.width() -
+                              WindowSizer::kDesktopBorderSize * 2, grid),
                         768 - WindowSizer::kDesktopBorderSize),
               window_bounds);
   }
@@ -127,10 +135,10 @@ TEST_F(WindowSizerTest, DefaultSizeCase) {
     EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x() +
                           WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        taskbar_left_work_area.width() -
-                          WindowSizer::kDesktopBorderSize * 2,
-                        taskbar_left_work_area.height() -
-                          WindowSizer::kDesktopBorderSize),
+                        align(taskbar_left_work_area.width() -
+                              WindowSizer::kDesktopBorderSize * 2, grid),
+                        align(taskbar_left_work_area.height() -
+                              WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }
 
@@ -142,8 +150,8 @@ TEST_F(WindowSizerTest, DefaultSizeCase) {
                         taskbar_top_work_area.y() +
                           WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
-                        taskbar_top_work_area.height() -
-                          WindowSizer::kDesktopBorderSize),
+                        align(taskbar_top_work_area.height() -
+                              WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }
 
@@ -174,7 +182,7 @@ TEST_F(WindowSizerTest, DefaultSizeCase) {
                     gfx::Rect(), DEFAULT, &window_bounds, NULL);
     EXPECT_EQ(gfx::Rect((1680 - 1280) / 2, WindowSizer::kDesktopBorderSize,
                         1280,
-                        1050 - WindowSizer::kDesktopBorderSize),
+                        align(1050 - WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }