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

Unified Diff: ui/compositor/test/context_factories_for_test.cc

Issue 306123007: Removes usage of Compositor/ContextFactory methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « ui/aura/demo/demo_main.cc ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/context_factories_for_test.cc
diff --git a/ui/compositor/test/context_factories_for_test.cc b/ui/compositor/test/context_factories_for_test.cc
index dbee78cf4e98e8b213f2303a40ec8e3693f657ad..f3eeeb369a39085c9ae8fb932c2e150399ca3ef8 100644
--- a/ui/compositor/test/context_factories_for_test.cc
+++ b/ui/compositor/test/context_factories_for_test.cc
@@ -30,12 +30,10 @@ ui::ContextFactory* InitializeContextFactoryForTests(bool enable_pixel_output) {
if (enable_pixel_output)
g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
g_implicit_factory = new InProcessContextFactory();
- ContextFactory::SetInstance(g_implicit_factory);
return g_implicit_factory;
}
void TerminateContextFactoryForTests() {
- ContextFactory::SetInstance(NULL);
delete g_implicit_factory;
g_implicit_factory = NULL;
delete g_disable_null_draw;
« no previous file with comments | « ui/aura/demo/demo_main.cc ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698