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

ash/wm/workspace/workspace_manager.h

 // 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.
 
 #ifndef ASH_WM_WORKSPACE_MANAGER_H_
 #define ASH_WM_WORKSPACE_MANAGER_H_
 
 #include <vector>
 
 #include "ash/ash_export.h"
@@ skipping 48 matching lines @@
 
   // Returns the window for rotate operation based on the |location|.
   // TODO: this isn't currently used; remove if we do away with overview.
   aura::Window* FindRotateWindowForLocation(const gfx::Point& location);
 
   // Returns the bounds in which a window can be moved/resized.
   gfx::Rect GetDragAreaBounds();
 
   // Sets the size of the grid. Newly added windows are forced to align to the
   // size of the grid.
-  void set_grid_size(int size) { grid_size_ = size; }
+  void SetGridSize(int grid_size);
   int grid_size() const { return grid_size_; }
 
   void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }
 
   // Updates the visibility and whether any windows overlap the shelf.
   void UpdateShelfVisibility();
 
   // Returns the current window state.
   WorkspaceWindowState GetWindowState() const;
 
@@ skipping 71 matching lines @@
   // Owned by the Shell container window LauncherContainer. May be NULL.
   ShelfLayoutManager* shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_MANAGER_H_