Index: ui/aura/test/aura_test_base.cc |
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc |
index 7dfe74db48ab24c7e8a828302fe43b2eb066ae6e..22ce7a5e31cd1f9f3b30ff1348a7e8928f4c2612 100644 |
--- a/ui/aura/test/aura_test_base.cc |
+++ b/ui/aura/test/aura_test_base.cc |
@@ -10,6 +10,7 @@ |
#include "ui/aura/test/test_window_delegate.h" |
#include "ui/aura/window.h" |
#include "ui/base/ime/input_method_initializer.h" |
+#include "ui/compositor/test/context_factories_for_test.h" |
#include "ui/events/gestures/gesture_configuration.h" |
namespace aura { |
@@ -68,9 +69,12 @@ void AuraTestBase::SetUp() { |
3, 0.8f); |
ui::GestureConfiguration::set_fling_velocity_cap(15000.0f); |
+ // The ContextFactory must exist before any Compositors are created. |
+ bool enable_pixel_output = false; |
+ ui::InitializeContextFactoryForTests(enable_pixel_output); |
+ |
helper_.reset(new AuraTestHelper(&message_loop_)); |
- bool allow_test_contexts = true; |
- helper_->SetUp(allow_test_contexts); |
+ helper_->SetUp(); |
} |
void AuraTestBase::TearDown() { |
@@ -81,6 +85,7 @@ void AuraTestBase::TearDown() { |
RunAllPendingInMessageLoop(); |
helper_->TearDown(); |
+ ui::TerminateContextFactoryForTests(); |
ui::ShutdownInputMethodForTesting(); |
testing::Test::TearDown(); |
} |