Removes the grid from ash.

ash/wm/window_manager_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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
@@ skipping 348 matching lines @@
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
-  // Disable ash grid so that test can place a window at
-  // specific location.
-  ash::Shell::GetInstance()->DisableWorkspaceGridLayout();
 
   // Create a window.
   const int kWindowLeft = 123;
   const int kWindowTop = 45;
   HitTestWindowDelegate window_delegate;
   scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
     &window_delegate,
     -1,
     gfx::Rect(kWindowLeft, kWindowTop, 640, 480),
     NULL));
@@ skipping 77 matching lines @@
     EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type());
   }
 }
 
 #if defined(OS_MACOSX)
 #define MAYBE_TransformActivate FAILS_TransformActivate
 #else
 #define MAYBE_TransformActivate TransformActivate
 #endif
 TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
-  // Disable ash grid so that test can place a window at
-  // specific location.
-  ash::Shell::GetInstance()->DisableWorkspaceGridLayout();
-
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   gfx::Size size = root_window->bounds().size();
   EXPECT_EQ(
       gfx::Rect(size).ToString(),
       gfx::Screen::GetDisplayNearestPoint(gfx::Point()).bounds().ToString());
 
   // Rotate it clock-wise 90 degrees.
   ui::Transform transform;
   transform.SetRotate(90.0f);
   transform.ConcatTranslate(size.width(), 0);
@@ skipping 137 matching lines @@
   env_filter->set_update_cursor_visibility(false);
   cursor_manager->ShowCursor(false);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   cursor_manager->ShowCursor(true);
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash