| Index: ash/test/test_shell_delegate.cc
|
| diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
|
| index 9b51e6a78260aec1a600668612dd643166407235..f7b1eaaee1b85c3b5dc7ceda2ee332875559445e 100644
|
| --- a/ash/test/test_shell_delegate.cc
|
| +++ b/ash/test/test_shell_delegate.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/logging.h"
|
| #include "content/public/test/test_browser_context.h"
|
| #include "ui/aura/window.h"
|
| +#include "ui/compositor/compositor.h"
|
|
|
| namespace ash {
|
| namespace test {
|
| @@ -203,6 +204,10 @@ double TestShellDelegate::GetSavedScreenMagnifierScale() {
|
| }
|
|
|
| RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
|
| + // The ContextFactory must exist before any Compositors are created.
|
| + bool allow_test_contexts = true;
|
| + ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
|
| +
|
| return RootWindowHostFactory::Create();
|
| }
|
|
|
|
|