Split //ui/gl into //ui/gl + //ui/gi/init.

gpu/gles2_conform_support/egl/thread_state.cc

Index: gpu/gles2_conform_support/egl/thread_state.cc
diff --git a/gpu/gles2_conform_support/egl/thread_state.cc b/gpu/gles2_conform_support/egl/thread_state.cc
index 41593cb1d4a1dc3d2ba1aa2a567b9cf9ff52ffeb..13c5f89d7d2d0111c365200b3aec8d889aa54d0a 100644
--- a/gpu/gles2_conform_support/egl/thread_state.cc
+++ b/gpu/gles2_conform_support/egl/thread_state.cc
@@ -22,6 +22,7 @@
 #include "gpu/gles2_conform_support/egl/test_support.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
+#include "ui/gl/init/gl_factory.h"
 
 // Thread local key for ThreadState instance. Accessed when holding g_egl_lock
 // only, since the initialization can not be Guaranteed otherwise.  Not in
@@ -83,7 +84,7 @@ egl::ThreadState* ThreadState::Get() {
         gpu::ApplyGpuDriverBugWorkarounds(gpu_info, command_line);
       }
 
-      gfx::GLSurface::InitializeOneOff();
+      gl::init::InitializeGLOneOff();
     }
 
     g_egl_default_display = new egl::Display();