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

gpu/tools/compositor_model_bench/compositor_model_bench.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This tool is used to benchmark the render model used by the compositor
 
 // Most of this file is derived from the source of the tile_render_bench tool,
 // and has been changed to  support running a sequence of independent
 // simulations for our different render models and test cases.
 
@@ skipping 17 matching lines @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #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;
 using base::PathExists;
 using std::queue;
 using std::string;
 
 struct SimulationSpecification {
   string simulation_name;
   base::FilePath input_path;
@@ skipping 130 matching lines @@
                  ExposureMask | KeyPressMask | StructureNotifyMask);
     XMapWindow(display_, window_);
 
     XResizeWindow(display_, window_, WINDOW_WIDTH, WINDOW_HEIGHT);
 
     return true;
   }
 
   // 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;
     }
 
     XWindowAttributes attributes;
     XGetWindowAttributes(display_, window_, &attributes);
     XVisualInfo visual_info_template;
     visual_info_template.visualid = XVisualIDFromVisual(attributes.visual);
     int visual_info_count = 0;
     XVisualInfo* visual_info_list = XGetVisualInfo(display_, VisualIDMask,
                                                    &visual_info_template,
@@ skipping 192 matching lines @@
     }
   } else {
     LOG(INFO) << "(input path is a file)";
     sim.QueueTest(inPath);
   }
 
   sim.Run();
 
   return 0;
 }