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

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

Index: trunk/src/ui/compositor/test/default_context_factory.cc
===================================================================
--- trunk/src/ui/compositor/test/default_context_factory.cc	(revision 247809)
+++ trunk/src/ui/compositor/test/default_context_factory.cc	(working copy)
@@ -15,12 +15,20 @@
 namespace ui {
 
 DefaultContextFactory::DefaultContextFactory() {
-  DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone);
 }
 
 DefaultContextFactory::~DefaultContextFactory() {
 }
 
+bool DefaultContextFactory::Initialize() {
+  if (!gfx::GLSurface::InitializeOneOff() ||
+      gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
+    LOG(ERROR) << "Could not load the GL bindings";
+    return false;
+  }
+  return true;
+}
+
 scoped_ptr<cc::OutputSurface> DefaultContextFactory::CreateOutputSurface(
     Compositor* compositor, bool software_fallback) {
   DCHECK(!software_fallback);