Revert 259580 "Move wm/public into wm target"

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

Index: trunk/src/ui/wm/test/wm_test_helper.cc
===================================================================
--- trunk/src/ui/wm/test/wm_test_helper.cc	(revision 259588)
+++ trunk/src/ui/wm/test/wm_test_helper.cc	(working copy)
@@ -4,37 +4,49 @@
 
 #include "ui/wm/test/wm_test_helper.h"
 
-#include "base/message_loop/message_loop.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 "ui/aura/window.h"
-#include "ui/wm/core/default_activation_client.h"
+#include "ui/wm/core/compound_event_filter.h"
+#include "ui/wm/core/input_method_event_filter.h"
 
 namespace wm {
 
-WMTestHelper::WMTestHelper(const gfx::Size& default_window_size)
-    : aura::test::AuraTestHelper(base::MessageLoopForUI::current()) {
-  default_window_size_ = default_window_size;
-}
+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()
-    : aura::test::AuraTestHelper(base::MessageLoopForUI::current()) {
-}
+  focus_client_.reset(new aura::test::TestFocusClient);
+  aura::client::SetFocusClient(host_->window(), focus_client_.get());
 
-WMTestHelper::~WMTestHelper() {
-}
+  root_window_event_filter_ = new wm::CompoundEventFilter;
+  // Pass ownership of the filter to the root_window.
+  host_->window()->SetEventFilter(root_window_event_filter_);
 
-////////////////////////////////////////////////////////////////////////////////
-// WMTestHelper, AuraTestHelper overrides:
+  input_method_filter_.reset(new wm::InputMethodEventFilter(
+      host_->GetAcceleratedWidget()));
+  input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
+  root_window_event_filter_->AddHandler(input_method_filter_.get());
 
-void WMTestHelper::SetUp() {
-  aura::test::AuraTestHelper::SetUp();
   activation_client_.reset(
-      new aura::client::DefaultActivationClient(root_window()));
+      new aura::client::DefaultActivationClient(host_->window()));
+
+  capture_client_.reset(
+      new aura::client::DefaultCaptureClient(host_->window()));
 }
 
-void WMTestHelper::TearDown() {
-  activation_client_.reset();
-  aura::test::AuraTestHelper::TearDown();
+WMTestHelper::~WMTestHelper() {
+  root_window_event_filter_->RemoveHandler(input_method_filter_.get());
 }
 
+aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
+                                             aura::Window* window,
+                                             const gfx::Rect& bounds) {
+  return host_->window();
+}
 
 }  // namespace wm