Move wm/public into wm target

ui/views/test/views_test_base.cc

Index: ui/views/test/views_test_base.cc
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index 4bf036ce68430e695085b05d72d20a322364389b..b433804500bd02c24d6be43279959ee8d8e565b2 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -13,6 +13,7 @@
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/wm_state.h"
+#include "ui/wm/test/wm_test_helper.h"
 
 namespace views {
 
@@ -37,8 +38,8 @@ void ViewsTestBase::SetUp() {
   bool enable_pixel_output = false;
   ui::InitializeContextFactoryForTests(enable_pixel_output);
 
-  aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
-  aura_test_helper_->SetUp();
+  wm_test_helper_.reset(new wm::WMTestHelper);
+  wm_test_helper_->SetUp();
   wm_state_.reset(new ::wm::WMState);
   ui::InitializeInputMethodForTesting();
 }
@@ -53,7 +54,7 @@ void ViewsTestBase::TearDown() {
   views_delegate_.reset();
   testing::Test::TearDown();
   ui::ShutdownInputMethodForTesting();
-  aura_test_helper_->TearDown();
+  wm_test_helper_->TearDown();
   ui::TerminateContextFactoryForTests();
   wm_state_.reset();
   CHECK(!wm::ScopedCaptureClient::IsActive());
@@ -67,20 +68,20 @@ void ViewsTestBase::RunPendingMessages() {
 Widget::InitParams ViewsTestBase::CreateParams(
     Widget::InitParams::Type type) {
   Widget::InitParams params(type);
-  params.context = aura_test_helper_->root_window();
+  params.context = host()->window();
   return params;
 }
 
 ui::EventProcessor* ViewsTestBase::event_processor() {
-  return aura_test_helper_->event_processor();
+  return wm_test_helper_->host()->event_processor();
 }
 
 aura::WindowTreeHost* ViewsTestBase::host() {
-  return aura_test_helper_->host();
+  return wm_test_helper_->host();
 }
 
 gfx::NativeView ViewsTestBase::GetContext() {
-  return aura_test_helper_->root_window();
+  return wm_test_helper_->host()->window();
 }
 
 }  // namespace views