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

gpu/tools/compositor_model_bench/compositor_model_bench.cc

Index: gpu/tools/compositor_model_bench/compositor_model_bench.cc
diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
index 4d77353fa02bc49d4d822475d8b1b60faebdfff6..dca35a7b3fa3ca68b247bb04cd62c48cdfa87a0f 100644
--- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc
+++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
@@ -35,7 +35,7 @@
 #include "gpu/tools/compositor_model_bench/render_model_utils.h"
 #include "gpu/tools/compositor_model_bench/render_models.h"
 #include "gpu/tools/compositor_model_bench/render_tree.h"
-#include "ui/gl/gl_surface.h"
+#include "ui/gl/init/gl_factory.h"
 
 using base::TimeTicks;
 using base::DirectoryExists;
@@ -186,8 +186,8 @@ class Simulator {
 
   // Initialize the OpenGL context.
   bool InitGLContext() {
-    if (!gfx::GLSurface::InitializeOneOff()) {
-      LOG(FATAL) << "gfx::GLSurface::InitializeOneOff failed";
+    if (!gl::init::InitializeGLOneOff()) {
+      LOG(FATAL) << "gl::init::InitializeGLOneOff failed";
       return false;
     }