Revert 259580 "Move wm/public into wm target"

trunk/src/ui/keyboard/keyboard_controller_unittest.cc

Index: trunk/src/ui/keyboard/keyboard_controller_unittest.cc
===================================================================
--- trunk/src/ui/keyboard/keyboard_controller_unittest.cc	(revision 259588)
+++ trunk/src/ui/keyboard/keyboard_controller_unittest.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/layout_manager.h"
+#include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ -26,7 +27,6 @@
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/keyboard/keyboard_controller_proxy.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/wm/test/wm_test_helper.h"
 
 namespace keyboard {
 namespace {
@@ -165,8 +165,8 @@
     bool enable_pixel_output = false;
     ui::InitializeContextFactoryForTests(enable_pixel_output);
 
-    wm_test_helper_.reset(new wm::WMTestHelper);
-    wm_test_helper_->SetUp();
+    aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
+    aura_test_helper_->SetUp();
     ui::SetUpInputMethodFactoryForTesting();
     focus_controller_.reset(new TestFocusController(root_window()));
     proxy_ = new TestKeyboardControllerProxy();
@@ -176,11 +176,11 @@
   virtual void TearDown() OVERRIDE {
     controller_.reset();
     focus_controller_.reset();
-    wm_test_helper_->TearDown();
+    aura_test_helper_->TearDown();
     ui::TerminateContextFactoryForTests();
   }
 
-  aura::Window* root_window() { return wm_test_helper_->root_window(); }
+  aura::Window* root_window() { return aura_test_helper_->root_window(); }
   KeyboardControllerProxy* proxy() { return proxy_; }
   KeyboardController* controller() { return controller_.get(); }
 
@@ -202,7 +202,7 @@
   }
 
   base::MessageLoopForUI message_loop_;
-  scoped_ptr<aura::test::AuraTestHelper> wm_test_helper_;
+  scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
   scoped_ptr<TestFocusController> focus_controller_;
 
  private: