Move wm/public into wm target

ui/aura/test/aura_test_helper.h

Index: ui/aura/test/aura_test_helper.h
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h
index f79ca76782c32edbffee0c61fac7b47db93fc5b5..f1d6dd5a02c11c23a7b07b84018651e6022f1bb8 100644
--- a/ui/aura/test/aura_test_helper.h
+++ b/ui/aura/test/aura_test_helper.h
@@ -22,7 +22,6 @@ class ScopedAnimationDurationScaleMode;
 namespace aura {
 class TestScreen;
 namespace client {
-class DefaultActivationClient;
 class DefaultCaptureClient;
 class FocusClient;
 }
@@ -35,14 +34,14 @@ class TestWindowTreeClient;
 class AuraTestHelper {
  public:
   explicit AuraTestHelper(base::MessageLoopForUI* message_loop);
-  ~AuraTestHelper();
+  virtual ~AuraTestHelper();
 
   // Creates and initializes (shows and sizes) the RootWindow for use in tests.
-  void SetUp();
+  virtual void SetUp();
 
   // Clean up objects that are created for tests. This also deletes the Env
   // object.
-  void TearDown();
+  virtual void TearDown();
 
   // Flushes message loop.
   void RunAllPendingInMessageLoop();
@@ -53,6 +52,9 @@ class AuraTestHelper {
 
   TestScreen* test_screen() { return test_screen_.get(); }
 
+ protected:
+  gfx::Size default_window_size_;
+
  private:
   base::MessageLoopForUI* message_loop_;
   bool setup_called_;
@@ -60,7 +62,6 @@ class AuraTestHelper {
   bool owns_host_;
   scoped_ptr<WindowTreeHost> host_;
   scoped_ptr<TestWindowTreeClient> stacking_client_;
-  scoped_ptr<client::DefaultActivationClient> activation_client_;
   scoped_ptr<client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::InputMethod> test_input_method_;
   scoped_ptr<client::FocusClient> focus_client_;