Removes the grid from ash.

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 "chrome/browser/ui/window_sizer/window_sizer.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 61 matching lines @@
 };
 
 } // namespace
 
 TestBrowserWindowAura::TestBrowserWindowAura(aura::Window *native_window)
     : native_window_(native_window) {
 }
 
 TestBrowserWindowAura::~TestBrowserWindowAura() {}
 
+int AlignToGridRoundDown(int location, int grid_size) {
+  if (grid_size <= 1 || location % grid_size == 0)
+    return location;
+  return location / grid_size * grid_size;
+}
+
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST_F(WindowSizerTest, DefaultSizeCase) {
-  int grid = ash::Shell::GetInstance()->GetGridSize();
-  EXPECT_EQ(WindowSizer::kDesktopBorderSize, grid);
+  int grid = WindowSizer::kDesktopBorderSize;
   { // 4:3 monitor case, 1024x768, no taskbar
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL, gfx::Rect());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
                         768 - WindowSizer::kDesktopBorderSize),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on bottom
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_bottom_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
-                        ash::WindowResizer::AlignToGridRoundDown(
+                        AlignToGridRoundDown(
                             taskbar_bottom_work_area.height() -
                             WindowSizer::kDesktopBorderSize, grid)),
                         window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on right
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_right_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        ash::WindowResizer::AlignToGridRoundDown(
+                        AlignToGridRoundDown(
                             taskbar_right_work_area.width() -
                             WindowSizer::kDesktopBorderSize * 2, grid),
                         768 - WindowSizer::kDesktopBorderSize),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on left
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(taskbar_left_work_area.x() +
                           WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        ash::WindowResizer::AlignToGridRoundDown(
+                        AlignToGridRoundDown(
                             taskbar_left_work_area.width() -
                         WindowSizer::kDesktopBorderSize * 2, grid),
-                            ash::WindowResizer::AlignToGridRoundDown(
+                            AlignToGridRoundDown(
                             taskbar_left_work_area.height() -
                             WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1024x768, taskbar on top
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_top_work_area, gfx::Rect(),
                     gfx::Rect(), gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         taskbar_top_work_area.y() +
                           WindowSizer::kDesktopBorderSize,
                         1024 - WindowSizer::kDesktopBorderSize * 2,
-                        ash::WindowResizer::AlignToGridRoundDown(
+                        AlignToGridRoundDown(
                             taskbar_top_work_area.height() -
                             WindowSizer::kDesktopBorderSize, grid)),
               window_bounds);
   }
 
   { // 4:3 monitor case, 1280x1024
     gfx::Rect window_bounds;
     GetWindowBounds(twelveeighty, twelveeighty, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL, gfx::Rect());
     EXPECT_EQ(gfx::Rect((1280 - WindowSizer::kMaximumWindowWidth) / 2,
@@ skipping 14 matching lines @@
               window_bounds);
   }
 
   { // 16:10 monitor case, 1680x1050
     gfx::Rect window_bounds;
     GetWindowBounds(sixteeneighty, sixteeneighty, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL, gfx::Rect());
     EXPECT_EQ(gfx::Rect((1680 - WindowSizer::kMaximumWindowWidth) / 2,
                         WindowSizer::kDesktopBorderSize,
                         WindowSizer::kMaximumWindowWidth,
-                        ash::WindowResizer::AlignToGridRoundDown(
+                        AlignToGridRoundDown(
                             1050 - WindowSizer::kDesktopBorderSize,
                             grid)),
               window_bounds);
   }
 
   { // 16:10 monitor case, 1920x1200
     gfx::Rect window_bounds;
     GetWindowBounds(nineteentwenty, nineteentwenty, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL, gfx::Rect());
     EXPECT_EQ(gfx::Rect((1920 - WindowSizer::kMaximumWindowWidth) / 2,
@@ skipping 500 matching lines @@
   }
 
   { // Check that a window which hangs out of the screen get moved back in.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect(1020, 700, 100, 100));
     EXPECT_EQ(gfx::Rect(924, 668, 100, 100), window_bounds);
   }
 }