| Index: ui/keyboard/keyboard_controller_unittest.cc
|
| diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc
|
| index 98e08957b22d3899c2db9a47e5740b27d08da4b9..b1014e7c47b77062cd960ef61d308cca23f82209 100644
|
| --- a/ui/keyboard/keyboard_controller_unittest.cc
|
| +++ b/ui/keyboard/keyboard_controller_unittest.cc
|
| @@ -18,6 +18,7 @@
|
| #include "ui/base/ime/input_method_factory.h"
|
| #include "ui/base/ime/text_input_client.h"
|
| #include "ui/compositor/layer_type.h"
|
| +#include "ui/compositor/test/context_factories_for_test.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/keyboard/keyboard_controller.h"
|
| #include "ui/keyboard/keyboard_controller_proxy.h"
|
| @@ -197,9 +198,12 @@ class KeyboardControllerTest : public testing::Test {
|
| virtual ~KeyboardControllerTest() {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| + // The ContextFactory must exist before any Compositors are created.
|
| + bool enable_pixel_output = false;
|
| + ui::InitializeContextFactoryForTests(enable_pixel_output);
|
| +
|
| aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
|
| - bool allow_test_contexts = true;
|
| - aura_test_helper_->SetUp(allow_test_contexts);
|
| + aura_test_helper_->SetUp();
|
| ui::SetUpInputMethodFactoryForTesting();
|
| focus_controller_.reset(new TestFocusController(root_window()));
|
| proxy_ = new TestKeyboardControllerProxy();
|
| @@ -210,6 +214,7 @@ class KeyboardControllerTest : public testing::Test {
|
| controller_.reset();
|
| focus_controller_.reset();
|
| aura_test_helper_->TearDown();
|
| + ui::TerminateContextFactoryForTests();
|
| }
|
|
|
| aura::Window* root_window() { return aura_test_helper_->root_window(); }
|
|
|