Initial crack at new workspace behavior. Each workspace now has its

ash/wm/workspace_controller_test_helper.h

Index: ash/wm/workspace_controller_test_helper.h
diff --git a/ash/wm/workspace_controller_test_helper.h b/ash/wm/workspace_controller_test_helper.h
index c48f0964c2b77ea3352c53d2a2db719c68be8178..38abfb219195612eb884b9546dc34862d1d53027 100644
--- a/ash/wm/workspace_controller_test_helper.h
+++ b/ash/wm/workspace_controller_test_helper.h
@@ -7,6 +7,7 @@
 
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_manager.h"
+#include "ash/wm/workspace/workspace_manager2.h"
 
 namespace ash {
 namespace internal {
@@ -25,6 +26,10 @@ class WorkspaceControllerTestHelper {
     return static_cast<WorkspaceManager*>(
         controller_->workspace_manager_.get());
   }
+  WorkspaceManager2* workspace_manager2() {
+    return static_cast<WorkspaceManager2*>(
+        controller_->workspace_manager_.get());
+  }
 
  private:
   WorkspaceController* controller_;