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

components/display_compositor/gl_helper_unittest.cc

 // Copyright 2016 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 <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <cmath>
 #include <string>
@@ skipping 55 matching lines @@
     attributes.sample_buffers = 1;
     attributes.bind_generates_resource = false;
 
     context_.reset(gpu::GLInProcessContext::Create(
         nullptr,                     /* service */
         nullptr,                     /* surface */
         true,                        /* offscreen */
         gfx::kNullAcceleratedWidget, /* window */
         gfx::Size(1, 1),             /* size */
         nullptr,                     /* share_context */
-        attributes, gfx::PreferDiscreteGpu, gpu::SharedMemoryLimits(),
+        attributes, gl::PreferDiscreteGpu, gpu::SharedMemoryLimits(),
         nullptr, /* gpu_memory_buffer_manager */
         nullptr /* image_factory */));
     gl_ = context_->GetImplementation();
     gpu::ContextSupport* support = context_->GetImplementation();
 
     helper_.reset(new display_compositor::GLHelper(gl_, support));
     helper_scaling_.reset(
         new display_compositor::GLHelperScaling(gl_, helper_.get()));
   }
 
@@ skipping 1174 matching lines @@
   std::unique_ptr<gpu::GLInProcessContext> context_;
   gpu::gles2::GLES2Interface* gl_;
   std::unique_ptr<display_compositor::GLHelper> helper_;
   std::unique_ptr<display_compositor::GLHelperScaling> helper_scaling_;
   std::deque<GLHelperScaling::ScaleOp> x_ops_, y_ops_;
   base::MessageLoop message_loop_;
 };
 
 class GLHelperPixelTest : public GLHelperTest {
  private:
-  gfx::DisableNullDrawGLBindings enable_pixel_output_;
+  gl::DisableNullDrawGLBindings enable_pixel_output_;
 };
 
 TEST_F(GLHelperTest, RGBASyncReadbackTest) {
   const int kTestSize = 64;
   bool result = TestTextureFormatReadback(gfx::Size(kTestSize, kTestSize),
                                           kRGBA_8888_SkColorType, false);
   EXPECT_EQ(result, true);
 }
 
 TEST_F(GLHelperTest, BGRASyncReadbackTest) {
@@ skipping 147 matching lines @@
     }
   }
 }
 
 TEST_F(GLHelperTest, CheckOptimizations) {
   // Test in baseclass since it is friends with GLHelperScaling
   CheckOptimizationsTest();
 }
 
 }  // namespace display_compositor