Removes the grid from ash.

ash/wm/custom_frame_view_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/wm/custom_frame_view_ash.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_bubble_controller.h"
 #include "ash/wm/window_util.h"
@@ skipping 139 matching lines @@
 }
 
 // Tests that click+dragging on the resize-button tiles or minimizes the window.
 TEST_F(CustomFrameViewAshTest, ResizeButtonDrag) {
   views::Widget* widget = CreateWidget();
   aura::Window* window = widget->GetNativeWindow();
   CustomFrameViewAsh* frame = custom_frame_view_ash(widget);
   CustomFrameViewAsh::TestApi test(frame);
   views::View* view = test.maximize_button();
   gfx::Point center = view->GetBoundsInScreen().CenterPoint();
-  const int kGridSize = ash::Shell::GetInstance()->GetGridSize();
 
   aura::test::EventGenerator generator(window->GetRootWindow(), center);
 
   EXPECT_TRUE(ash::wm::IsWindowNormal(window));
 
   // Snap right.
   {
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 0);
     generator.ReleaseLeftButton();
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
-        internal::SnapSizer::RIGHT_EDGE, kGridSize);
+        internal::SnapSizer::RIGHT_EDGE);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Snap left.
   {
     center = view->GetBoundsInScreen().CenterPoint();
     generator.MoveMouseTo(center);
     generator.PressLeftButton();
     generator.MoveMouseBy(-10, 0);
     generator.ReleaseLeftButton();
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
-        internal::SnapSizer::LEFT_EDGE, kGridSize);
+        internal::SnapSizer::LEFT_EDGE);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Minimize.
   {
     center = view->GetBoundsInScreen().CenterPoint();
     generator.MoveMouseTo(center);
     generator.PressLeftButton();
     generator.MoveMouseBy(0, 10);
     generator.ReleaseLeftButton();
@@ skipping 12 matching lines @@
     gfx::Point end = center;
     end.Offset(40, 0);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
-        internal::SnapSizer::RIGHT_EDGE, kGridSize);
+        internal::SnapSizer::RIGHT_EDGE);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Snap left.
   {
     center = view->GetBoundsInScreen().CenterPoint();
     gfx::Point end = center;
     end.Offset(-40, 0);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     internal::SnapSizer sizer(window, center,
-        internal::SnapSizer::LEFT_EDGE, kGridSize);
+        internal::SnapSizer::LEFT_EDGE);
     EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
   }
 
   // Minimize.
   {
     center = view->GetBoundsInScreen().CenterPoint();
     gfx::Point end = center;
     end.Offset(0, 40);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
@@ skipping 79 matching lines @@
   generator.MoveMouseTo(off_pos);
   generator.ReleaseLeftButton();
 
   // Check that the phantom window is also gone.
   EXPECT_FALSE(maximize_button->phantom_window_open());
 }
 
 // Test that clicking a button in the maximizer bubble (in this case the
 // maximize left button) will do the requested action.
 TEST_F(CustomFrameViewAshTest, MaximizeLeftByButton) {
-  const int kGridSize = ash::Shell::GetInstance()->GetGridSize();
   views::Widget* widget = CreateWidget();
   aura::Window* window = widget->GetNativeWindow();
   CustomFrameViewAsh* frame = custom_frame_view_ash(widget);
   CustomFrameViewAsh::TestApi test(frame);
   ash::FrameMaximizeButton* maximize_button = test.maximize_button();
   maximize_button->set_bubble_appearance_delay_ms(0);
   gfx::Point button_pos = maximize_button->GetBoundsInScreen().CenterPoint();
   gfx::Point off_pos(button_pos.x() + 100, button_pos.y() + 100);
 
   aura::test::EventGenerator generator(window->GetRootWindow(), off_pos);
@@ skipping 11 matching lines @@
   generator.MoveMouseTo(left_max_pos);
   EXPECT_TRUE(maximize_button->phantom_window_open());
   generator.ClickLeftButton();
 
   EXPECT_FALSE(maximize_button->maximizer());
   EXPECT_FALSE(maximize_button->phantom_window_open());
 
   EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
   EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
   internal::SnapSizer sizer(window, button_pos,
-      internal::SnapSizer::LEFT_EDGE, kGridSize);
+                            internal::SnapSizer::LEFT_EDGE);
   sizer.SelectDefaultSizeAndDisableResize();
   EXPECT_EQ(sizer.target_bounds().ToString(), window->bounds().ToString());
 }
 
 // Test that the activation focus does not change when the bubble gets shown.
 TEST_F(CustomFrameViewAshTest, MaximizeKeepFocus) {
   views::Widget* widget = CreateWidget();
   aura::Window* window = widget->GetNativeWindow();
   CustomFrameViewAsh* frame = custom_frame_view_ash(widget);
   CustomFrameViewAsh::TestApi test(frame);
@@ skipping 220 matching lines @@
   EXPECT_EQ(new_bounds.x(), initial_bounds.x());
   EXPECT_EQ(new_bounds.y(), initial_bounds.x());
   EXPECT_EQ(new_bounds.width(), initial_bounds.width());
   EXPECT_EQ(new_bounds.height(), initial_bounds.height());
   // Make sure that there is no restore rectangle left.
   EXPECT_EQ(NULL, window->GetProperty(aura::client::kRestoreBoundsKey));
 }
 
 }  // namespace internal
 }  // namespace ash