diff options
Diffstat (limited to 'ui/keyboard/keyboard_controller_unittest.cc')
| -rw-r--r-- | ui/keyboard/keyboard_controller_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index d735883..c797013 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -9,7 +9,6 @@ #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" @@ -27,6 +26,7 @@ #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 @@ class KeyboardControllerTest : public testing::Test { 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(); ui::SetUpInputMethodFactoryForTesting(); focus_controller_.reset(new TestFocusController(root_window())); proxy_ = new TestKeyboardControllerProxy(); @@ -176,11 +176,11 @@ class KeyboardControllerTest : public testing::Test { virtual void TearDown() OVERRIDE { controller_.reset(); focus_controller_.reset(); - aura_test_helper_->TearDown(); + wm_test_helper_->TearDown(); ui::TerminateContextFactoryForTests(); } - aura::Window* root_window() { return aura_test_helper_->root_window(); } + aura::Window* root_window() { return wm_test_helper_->root_window(); } KeyboardControllerProxy* proxy() { return proxy_; } KeyboardController* controller() { return controller_.get(); } @@ -202,7 +202,7 @@ class KeyboardControllerTest : public testing::Test { } base::MessageLoopForUI message_loop_; - scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; + scoped_ptr<aura::test::AuraTestHelper> wm_test_helper_; scoped_ptr<TestFocusController> focus_controller_; private: |