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

ash/wm/workspace_controller_test_helper.cc

Index: ash/wm/workspace_controller_test_helper.cc
diff --git a/ash/wm/workspace_controller_test_helper.cc b/ash/wm/workspace_controller_test_helper.cc
index 75177efb9a68b612fd64924299d6315cce96e594..df83eca22b4a2657da2b75308b868b986a77cbe5 100644
--- a/ash/wm/workspace_controller_test_helper.cc
+++ b/ash/wm/workspace_controller_test_helper.cc
@@ -20,6 +20,9 @@ WorkspaceControllerTestHelper::~WorkspaceControllerTestHelper() {
 }
 
 WorkspaceEventFilter* WorkspaceControllerTestHelper::GetFilter() {
+  if (WorkspaceController::IsWorkspace2Enabled())
+    return static_cast<WorkspaceEventFilter*>(
+        controller_->viewport_->children()[0]->event_filter());
   return controller_->event_filter_;
 }