Revert 266616 "Move DefaultActivationClient to wm/core"

trunk/src/ui/wm/test/wm_test_helper.h

Index: trunk/src/ui/wm/test/wm_test_helper.h
===================================================================
--- trunk/src/ui/wm/test/wm_test_helper.h	(revision 266631)
+++ trunk/src/ui/wm/test/wm_test_helper.h	(working copy)
@@ -14,6 +14,7 @@
 class Window;
 class WindowTreeHost;
 namespace client {
+class DefaultActivationClient;
 class DefaultCaptureClient;
 class FocusClient;
 }
@@ -50,6 +51,7 @@
   scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
+  scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WMTestHelper);