Move wm/public into wm target

ui/wm/test/wm_test_helper.cc

Index: ui/wm/test/wm_test_helper.cc
diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/test/wm_test_helper.cc
index 160923c8f36bcf4298d8d12c7e97da2ca4c0410f..b47de06cb3de43bbb5f42150d30e407a366f4c8b 100644
--- a/ui/wm/test/wm_test_helper.cc
+++ b/ui/wm/test/wm_test_helper.cc
@@ -4,49 +4,37 @@
 
 #include "ui/wm/test/wm_test_helper.h"
 
-#include "ui/aura/client/default_activation_client.h"
-#include "ui/aura/client/default_capture_client.h"
-#include "ui/aura/env.h"
-#include "ui/aura/test/test_focus_client.h"
+#include "base/message_loop/message_loop.h"
 #include "ui/aura/window.h"
-#include "ui/wm/core/compound_event_filter.h"
-#include "ui/wm/core/input_method_event_filter.h"
+#include "ui/wm/core/default_activation_client.h"
 
 namespace wm {
 
-WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) {
-  aura::Env::CreateInstance();
-  host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size)));
-  host_->InitHost();
-  aura::client::SetWindowTreeClient(host_->window(), this);
+WMTestHelper::WMTestHelper(const gfx::Size& default_window_size)
+    : aura::test::AuraTestHelper(base::MessageLoopForUI::current()) {
+  default_window_size_ = default_window_size;
+}
 
-  focus_client_.reset(new aura::test::TestFocusClient);
-  aura::client::SetFocusClient(host_->window(), focus_client_.get());
+WMTestHelper::WMTestHelper()
+    : aura::test::AuraTestHelper(base::MessageLoopForUI::current()) {
+}
 
-  root_window_event_filter_ = new wm::CompoundEventFilter;
-  // Pass ownership of the filter to the root_window.
-  host_->window()->SetEventFilter(root_window_event_filter_);
+WMTestHelper::~WMTestHelper() {
+}
 
-  input_method_filter_.reset(new wm::InputMethodEventFilter(
-      host_->GetAcceleratedWidget()));
-  input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
-  root_window_event_filter_->AddHandler(input_method_filter_.get());
+////////////////////////////////////////////////////////////////////////////////
+// WMTestHelper, AuraTestHelper overrides:
 
+void WMTestHelper::SetUp() {
+  aura::test::AuraTestHelper::SetUp();
   activation_client_.reset(
-      new aura::client::DefaultActivationClient(host_->window()));
-
-  capture_client_.reset(
-      new aura::client::DefaultCaptureClient(host_->window()));
+      new aura::client::DefaultActivationClient(root_window()));
 }
 
-WMTestHelper::~WMTestHelper() {
-  root_window_event_filter_->RemoveHandler(input_method_filter_.get());
+void WMTestHelper::TearDown() {
+  activation_client_.reset();
+  aura::test::AuraTestHelper::TearDown();
 }
 
-aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
-                                             aura::Window* window,
-                                             const gfx::Rect& bounds) {
-  return host_->window();
-}
 
 }  // namespace wm