| Index: ui/aura/test/aura_test_helper.cc
|
| diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
|
| index f04b46b819e8bc281e40fab6f0d2564e2d13de92..6cef5d95f96975fe747095a2f9dd2e3c8ec74600 100644
|
| --- a/ui/aura/test/aura_test_helper.cc
|
| +++ b/ui/aura/test/aura_test_helper.cc
|
| @@ -62,11 +62,10 @@ AuraTestHelper::~AuraTestHelper() {
|
| << "AuraTestHelper::TearDown() never called.";
|
| }
|
|
|
| -void AuraTestHelper::SetUp() {
|
| +void AuraTestHelper::SetUp(bool allow_test_contexts) {
|
| setup_called_ = true;
|
|
|
| // The ContextFactory must exist before any Compositors are created.
|
| - bool allow_test_contexts = true;
|
| ui::InitializeContextFactoryForTests(allow_test_contexts);
|
|
|
| Env::CreateInstance();
|
|
|