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

gpu/gles2_conform_support/egl/thread_state.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/thread_state.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/common/thread_local.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/gles2_conform_support/egl/context.h"
 #include "gpu/gles2_conform_support/egl/display.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 #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
 // anonymous namespace due to Mac OS X 10.6 linker. See gles2_lib.cc.
 static gpu::ThreadLocalKey g_egl_thread_state_key;
 
 namespace {
 base::LazyInstance<base::Lock>::Leaky g_egl_lock;
 int g_egl_active_thread_count;
 
@@ skipping 41 matching lines @@
       base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
       // Need to call both Init and InitFromArgv, since Windows does not use
       // argc, argv in CommandLine::Init(argc, argv).
       command_line->InitFromArgv(argv);
       if (!command_line->HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
         gpu::GPUInfo gpu_info;
         gpu::CollectBasicGraphicsInfo(&gpu_info);
         gpu::ApplyGpuDriverBugWorkarounds(gpu_info, command_line);
       }
 
-      gfx::GLSurface::InitializeOneOff();
+      gl::init::InitializeGLOneOff();
     }
 
     g_egl_default_display = new egl::Display();
     g_egl_thread_state_key = gpu::ThreadLocalAlloc();
   }
   egl::ThreadState* thread_state = static_cast<egl::ThreadState*>(
       gpu::ThreadLocalGetValue(g_egl_thread_state_key));
   if (!thread_state) {
     thread_state = new egl::ThreadState;
     gpu::ThreadLocalSetValue(g_egl_thread_state_key, thread_state);
@@ skipping 92 matching lines @@
     Context::ApplyContextReleased();
   }
 }
 
 void ThreadState::AutoCurrentContextRestore::SetCurrent(Surface* surface,
                                                         Context* context) {
   thread_state_->SetCurrent(surface, context);
 }
 
 }  // namespace egl