Prepare a bunch of ash tests for workspace2. With Workspace2 you can't

ash/wm/workspace/workspace_event_filter_unittest.cc

Index: ash/wm/workspace/workspace_event_filter_unittest.cc
diff --git a/ash/wm/workspace/workspace_event_filter_unittest.cc b/ash/wm/workspace/workspace_event_filter_unittest.cc
index 9aafb1fb1b8a3e7e58d15f13df3d857f36a27da2..ff9b659f53897e4c3fd32962e4b1a65b01b449a1 100644
--- a/ash/wm/workspace/workspace_event_filter_unittest.cc
+++ b/ash/wm/workspace/workspace_event_filter_unittest.cc
@@ -41,10 +41,7 @@ class WorkspaceEventFilterTest : public test::AshTestBase {
 };
 
 TEST_F(WorkspaceEventFilterTest, DoubleClickSingleAxisResizeEdge) {
-  WorkspaceControllerTestHelper workspace_helper(
-      Shell::TestApi(Shell::GetInstance()).workspace_controller());
-  WorkspaceManager* manager = workspace_helper.workspace_manager();
-  manager->set_grid_size(0);
+  Shell::TestApi(Shell::GetInstance()).workspace_controller()->SetGridSize(0);
 
   // Double clicking the vertical resize edge of a window should maximize it
   // vertically.
@@ -52,6 +49,8 @@ TEST_F(WorkspaceEventFilterTest, DoubleClickSingleAxisResizeEdge) {
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> window(CreateTestWindow(&wd, restored_bounds));
 
+  wm::ActivateWindow(window.get());
+
   gfx::Rect work_area =
       gfx::Screen::GetDisplayNearestWindow(window.get()).work_area();