Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Unified Diff: ash/test/test_shell_delegate.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | content/public/test/browser_test_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | content/public/test/browser_test_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698