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

ash/wm/workspace_controller.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/workspace_controller.h"
 
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
@@ skipping 33 matching lines @@
   // WorkspaceLayoutManager may attempt to access state from us. Destroy it now.
   if (viewport_->layout_manager() == layout_manager_)
     viewport_->SetLayoutManager(NULL);
 }
 
 bool WorkspaceController::IsInMaximizedMode() const {
   return workspace_manager_->IsInMaximizedMode();
 }
 
 void WorkspaceController::SetGridSize(int grid_size) {
-  workspace_manager_->set_grid_size(grid_size);
+  workspace_manager_->SetGridSize(grid_size);
   event_filter_->set_grid_size(grid_size);
 }
 
 int WorkspaceController::GetGridSize() const {
   return workspace_manager_->grid_size();
 }
 
 WorkspaceWindowState WorkspaceController::GetWindowState() const {
   return workspace_manager_->GetWindowState();
 }
 
 void WorkspaceController::SetShelf(ShelfLayoutManager* shelf) {
   workspace_manager_->set_shelf(shelf);
 }
 
 void WorkspaceController::OnWindowActivated(aura::Window* window,
                                             aura::Window* old_active) {
   workspace_manager_->SetActiveWorkspaceByWindow(window);
 }
 
 }  // namespace internal
 }  // namespace ash