Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/ui/compositor/test/context_factories_for_test.cc

Index: trunk/src/ui/compositor/test/context_factories_for_test.cc
===================================================================
--- trunk/src/ui/compositor/test/context_factories_for_test.cc	(revision 247809)
+++ trunk/src/ui/compositor/test/context_factories_for_test.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/test/default_context_factory.h"
 #include "ui/compositor/test/test_context_factory.h"
-#include "ui/gl/gl_implementation.h"
 
 namespace ui {
 
@@ -41,9 +40,11 @@
   if (use_test_contexts) {
     g_implicit_factory = new ui::TestContextFactory;
   } else {
-    DCHECK_NE(gfx::kGLImplementationNone, gfx::GetGLImplementation());
     DVLOG(1) << "Using DefaultContextFactory";
-    g_implicit_factory = new ui::DefaultContextFactory();
+    scoped_ptr<ui::DefaultContextFactory> instance(
+        new ui::DefaultContextFactory());
+    if (instance->Initialize())
+      g_implicit_factory = instance.release();
   }
   ContextFactory::SetInstance(g_implicit_factory);
 }