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

gpu/config/gpu_info_collector_android.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"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/android/build_info.h"
@@ skipping 86 matching lines @@
     proc = base::GetFunctionPointerFromNativeLibrary(gles_library, name);
     if (proc)
       return proc;
     proc = eglGetProcAddressFn(name);
     if (proc)
       return proc;
     LOG(FATAL) << "Failed to look up " << name;
     return (void *)nullptr;
   };
 
-#define LOOKUP_FUNC(x) auto x##Fn = reinterpret_cast<gfx::x##Proc>(get_func(#x))
+#define LOOKUP_FUNC(x) auto x##Fn = reinterpret_cast<gl::x##Proc>(get_func(#x))
 
   LOOKUP_FUNC(eglGetError);
   LOOKUP_FUNC(eglQueryString);
   LOOKUP_FUNC(eglGetCurrentContext);
   LOOKUP_FUNC(eglGetCurrentDisplay);
   LOOKUP_FUNC(eglGetCurrentSurface);
   LOOKUP_FUNC(eglGetDisplay);
   LOOKUP_FUNC(eglInitialize);
   LOOKUP_FUNC(eglChooseConfig);
   LOOKUP_FUNC(eglCreateContext);
@@ skipping 172 matching lines @@
   gpu_info->gpu.device_string = gpu_info->gl_renderer;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu