Move code in ui/gl/* from gfx:: to gl::

gpu/config/gpu_info_collector_win.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.
 
 #include "gpu/config/gpu_info_collector.h"
 
 // This has to be included before windows.h.
 #include "third_party/re2/src/re2/re2.h"
 
 #include <windows.h>
@@ skipping 321 matching lines @@
                            vertex_shader_major_version,
                            vertex_shader_minor_version);
     gpu_info->pixel_shader_version =
         base::StringPrintf("%d.%d",
                            pixel_shader_major_version,
                            pixel_shader_minor_version);
 
     // ANGLE's EGL vendor strings are of the form:
     // Google, Inc. (adapter LUID: 0123456789ABCDEF)
     // The LUID is optional and identifies the GPU adapter ANGLE is using.
-    const char* egl_vendor = eglQueryString(
-        gfx::GLSurfaceEGL::GetHardwareDisplay(),
-        EGL_VENDOR);
+    const char* egl_vendor =
+        eglQueryString(gl::GLSurfaceEGL::GetHardwareDisplay(), EGL_VENDOR);
     RE2::PartialMatch(egl_vendor,
                       " \\(adapter LUID: ([0-9A-Fa-f]{16})\\)",
                       RE2::Hex(&gpu_info->adapter_luid));
 
     // DirectX diagnostics are collected asynchronously because it takes a
     // couple of seconds.
   } else {
     gpu_info->dx_diagnostics_info_state = kCollectInfoNonFatalFailure;
   }
 
@@ skipping 140 matching lines @@
   }
 
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 
   basic_gpu_info->dx_diagnostics_info_state =
       context_gpu_info.dx_diagnostics_info_state;
   basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics;
 }
 
 }  // namespace gpu