Move wm/public into wm target

ui/wm/test/wm_test_helper.h

Index: ui/wm/test/wm_test_helper.h
diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/test/wm_test_helper.h
index e01486b93318ec3c4e8e45ed36c288aa6eafa2a5..ac5f1781b388c92c2106afc0b7b38a2a30fee2bb 100644
--- a/ui/wm/test/wm_test_helper.h
+++ b/ui/wm/test/wm_test_helper.h
@@ -7,56 +7,36 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/client/window_tree_client.h"
-#include "ui/aura/window_tree_host.h"
+#include "ui/aura/test/aura_test_helper.h"
 
 namespace aura {
-class Window;
-class WindowTreeHost;
 namespace client {
 class DefaultActivationClient;
-class DefaultCaptureClient;
-class FocusClient;
 }
 }
 
 namespace gfx {
-class Rect;
 class Size;
 }
 
 namespace wm {
-class CompoundEventFilter;
-class InputMethodEventFilter;
-}
-
-namespace wm {
 
 // Creates a minimal environment for running the shell. We can't pull in all of
 // ash here, but we can create attach several of the same things we'd find in
 // the ash parts of the code.
-class WMTestHelper : public aura::client::WindowTreeClient {
+class WMTestHelper : public aura::test::AuraTestHelper {
  public:
+  // TODO(beng): default size should probably not be passed through the ctor.
   explicit WMTestHelper(const gfx::Size& default_window_size);
+  WMTestHelper();
   virtual ~WMTestHelper();
 
-  aura::WindowTreeHost* host() { return host_.get(); }
-
-  // Overridden from client::WindowTreeClient:
-  virtual aura::Window* GetDefaultParent(aura::Window* context,
-                                         aura::Window* window,
-                                         const gfx::Rect& bounds) OVERRIDE;
+  // Overridden from aura::test::AuraTestHelper:
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
  private:
-  scoped_ptr<aura::WindowTreeHost> host_;
-
-  // Owned by the root Window.
-  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);
 };