ui: Move gl/ directory out of gfx/, up to ui/.

gpu/gles2_conform_support/egl/egl.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 <EGL/egl.h>
 
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "base/command_line.h"
 #include "gpu/gles2_conform_support/egl/display.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface.h"
 
 namespace {
 void SetCurrentError(EGLint error_code) {
 }
 
 template<typename T>
 T EglError(EGLint error_code, T return_value) {
   SetCurrentError(error_code);
   return return_value;
 }
@@ skipping 347 matching lines @@
                           EGLNativePixmapType target) {
   return EGL_FALSE;
 }
 
 /* Now, define eglGetProcAddress using the generic function ptr. type */
 __eglMustCastToProperFunctionPointerType
 eglGetProcAddress(const char* procname) {
   return NULL;
 }
 }  // extern "C"