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

ash/wm/workspace_controller_test_helper.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_test_helper.h"
 
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_event_filter_test_helper.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace internal {
 
 WorkspaceControllerTestHelper::WorkspaceControllerTestHelper(
     WorkspaceController* controller)
     : controller_(controller) {
 }
 
 WorkspaceControllerTestHelper::~WorkspaceControllerTestHelper() {
 }
 
 WorkspaceEventFilter* WorkspaceControllerTestHelper::GetFilter() {
+  if (WorkspaceController::IsWorkspace2Enabled())
+    return static_cast<WorkspaceEventFilter*>(
+        controller_->viewport_->children()[0]->event_filter());
   return controller_->event_filter_;
 }
 
 MultiWindowResizeController*
 WorkspaceControllerTestHelper::GetMultiWindowResizeController() {
   return WorkspaceEventFilterTestHelper(GetFilter()).resize_controller();
 }
 
 }  // namespace internal
 }  // namespace ash