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

gpu/perftests/texture_upload_perftest.cc

Index: gpu/perftests/texture_upload_perftest.cc
diff --git a/gpu/perftests/texture_upload_perftest.cc b/gpu/perftests/texture_upload_perftest.cc
index 86eeb021d2ff3cda26762359db6c1ff3e76e755d..984314307882a7d91afad29989ef60a40cd2e815 100644
--- a/gpu/perftests/texture_upload_perftest.cc
+++ b/gpu/perftests/texture_upload_perftest.cc
@@ -190,7 +190,7 @@ class TextureUploadPerfTest : public testing::Test {
     surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size());
     gl_context_ =
         gl::init::CreateGLContext(nullptr,  // share_group
-                                  surface_.get(), gfx::PreferIntegratedGpu);
+                                  surface_.get(), gl::PreferIntegratedGpu);
     ui::ScopedMakeCurrent smc(gl_context_.get(), surface_.get());
     glGenTextures(1, &color_texture_);
     glBindTexture(GL_TEXTURE_2D, color_texture_);
@@ -222,7 +222,7 @@ class TextureUploadPerfTest : public testing::Test {
     // used to draw a quad on the offscreen surface.
     vertex_shader_ = LoadShader(GL_VERTEX_SHADER, kVertexShader);
 
-    bool is_gles = gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
+    bool is_gles = gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2;
     fragment_shader_ = LoadShader(
         GL_FRAGMENT_SHADER,
         base::StringPrintf("%s%s", is_gles ? kShaderDefaultFloatPrecision : "",
@@ -380,7 +380,7 @@ class TextureUploadPerfTest : public testing::Test {
     CheckNoGlError("glReadPixels");
     EXPECT_TRUE(
         CompareBufferToRGBABuffer(format, size, pixels, pixels_rendered))
-        << "Format is: " << gfx::GLEnums::GetStringEnum(format);
+        << "Format is: " << gl::GLEnums::GetStringEnum(format);
 
     std::vector<Measurement> measurements;
     bool gpu_timer_errors =
@@ -421,7 +421,7 @@ class TextureUploadPerfTest : public testing::Test {
     glDeleteTextures(1, &texture_id);
 
     std::string graph_name = base::StringPrintf(
-        "%d_%s", size.width(), gfx::GLEnums::GetStringEnum(format).c_str());
+        "%d_%s", size.width(), gl::GLEnums::GetStringEnum(format).c_str());
     if (subimage) {
       graph_name += "_sub";
     }
@@ -437,9 +437,9 @@ class TextureUploadPerfTest : public testing::Test {
   }
 
   const gfx::Size fbo_size_;  // for the fbo
-  scoped_refptr<gfx::GLContext> gl_context_;
-  scoped_refptr<gfx::GLSurface> surface_;
-  scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
+  scoped_refptr<gl::GLContext> gl_context_;
+  scoped_refptr<gl::GLSurface> surface_;
+  scoped_refptr<gl::GPUTimingClient> gpu_timing_client_;
 
   GLuint color_texture_ = 0;
   GLuint framebuffer_object_ = 0;