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

components/mus/gles2/gpu_state.cc

 // Copyright 2015 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 "components/mus/gles2/gpu_state.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_surface.h"
+#include "ui/gl/init/gl_factory.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace mus {
 
 GpuState::GpuState()
     : gpu_thread_("gpu_thread"),
       control_thread_("gpu_command_buffer_control"),
@@ skipping 17 matching lines @@
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&GpuState::DestroyGpuSpecificStateOnGpuThread, this));
   gpu_thread_.Stop();
 }
 
 void GpuState::InitializeOnGpuThread(base::WaitableEvent* event) {
 #if defined(USE_OZONE)
   ui::OzonePlatform::InitializeForGPU();
 #endif
-  hardware_rendering_available_ = gfx::GLSurface::InitializeOneOff();
+  hardware_rendering_available_ = gl::init::InitializeGLOneOff();
   command_buffer_task_runner_ = new CommandBufferTaskRunner;
   driver_manager_.reset(new CommandBufferDriverManager);
   sync_point_manager_.reset(new gpu::SyncPointManager(true));
   share_group_ = new gfx::GLShareGroup;
   mailbox_manager_ = new gpu::gles2::MailboxManagerImpl;
 
   // TODO(penghuang): investigate why gpu::CollectBasicGraphicsInfo() failed on
   // windows remote desktop.
   const gfx::GLImplementation impl = gfx::GetGLImplementation();
   if (impl != gfx::kGLImplementationNone &&
@@ skipping 10 matching lines @@
   }
   event->Signal();
 
 }
 
 void GpuState::DestroyGpuSpecificStateOnGpuThread() {
   driver_manager_.reset();
 }
 
 }  // namespace mus