Revert 259580 "Move wm/public into wm target"

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 259588)
+++ trunk/src/ui/wm/test/wm_test_helper.h	(working copy)
@@ -7,35 +7,56 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/test/aura_test_helper.h"
+#include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/window_tree_host.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::test::AuraTestHelper {
+class WMTestHelper : public aura::client::WindowTreeClient {
  public:
   explicit WMTestHelper(const gfx::Size& default_window_size);
-  WMTestHelper();
   virtual ~WMTestHelper();
 
-  // Overridden from aura::test::AuraTestHelper:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  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;
+
  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);
 };