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

gpu/gles2_conform_support/egl/context.cc

 // Copyright (c) 2016 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.
 
 #include "gpu/gles2_conform_support/egl/context.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/display.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 #include "gpu/gles2_conform_support/egl/thread_state.h"
+#include "ui/gl/init/gl_factory.h"
 
 // The slight complexification in this file comes from following properties:
 // 1) Command buffer connection (context) can not be established without a
 // GLSurface. EGL Context can be created independent of a surface.  This is why
 // the connection is created only during first MakeCurrent.
 // 2) Command buffer MakeCurrent calls need the real gl context and surface be
 // current.
 // 3) Client can change real EGL context behind the scenes and then still expect
 // command buffer MakeCurrent re-set the command buffer context. This is why all
 // MakeCurrent calls must actually reset the real context, even though command
@@ skipping 232 matching lines @@
       gpu::gles2::GLES2Decoder::Create(group.get()));
   if (!decoder.get())
     return false;
 
   std::unique_ptr<gpu::CommandExecutor> command_executor(
       new gpu::CommandExecutor(command_buffer.get(), decoder.get(),
                                decoder.get()));
 
   decoder->set_engine(command_executor.get());
 
-  scoped_refptr<gfx::GLContext> gl_context(gfx::GLContext::CreateGLContext(
-      nullptr, gl_surface, gfx::PreferDiscreteGpu));
+  scoped_refptr<gfx::GLContext> gl_context(
+      gl::init::CreateGLContext(nullptr, gl_surface, gfx::PreferDiscreteGpu));
   if (!gl_context)
     return false;
 
   gl_context->MakeCurrent(gl_surface);
 
   gpu::gles2::ContextCreationAttribHelper helper;
   config_->GetAttrib(EGL_ALPHA_SIZE, &helper.alpha_size);
   config_->GetAttrib(EGL_DEPTH_SIZE, &helper.depth_size);
   config_->GetAttrib(EGL_STENCIL_SIZE, &helper.stencil_size);
 
@@ skipping 101 matching lines @@
     return false;
   if (!gl_context_->MakeCurrent(gl_surface)) {
     MarkServiceContextLost();
     return false;
   }
   client_gl_context_->Flush();
   return true;
 }
 
 }  // namespace egl