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

components/display_compositor/yuv_readback_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 "base/json/json_reader.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
@@ skipping 27 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));
   }
 
   void TearDown() override {
     helper_.reset(NULL);
@@ skipping 406 matching lines @@
         V, v_stride, output_frame->visible_data(media::VideoFrame::kVPlane),
         output_frame->stride(media::VideoFrame::kVPlane), 2, output_xsize / 2,
         output_ysize / 2, &input_pixels, message + " V plane");
 
     gl_->DeleteTextures(1, &src_texture);
   }
 
   std::unique_ptr<gpu::GLInProcessContext> context_;
   gpu::gles2::GLES2Interface* gl_;
   std::unique_ptr<display_compositor::GLHelper> helper_;
-  gfx::DisableNullDrawGLBindings enable_pixel_output_;
+  gl::DisableNullDrawGLBindings enable_pixel_output_;
   base::MessageLoop message_loop_;
 };
 
 TEST_F(YUVReadbackTest, YUVReadbackOptTest) {
   // This test uses the gpu.service/gpu_decoder tracing events to detect how
   // many scaling passes are actually performed by the YUV readback pipeline.
   StartTracing(TRACE_DISABLED_BY_DEFAULT(
       "gpu.service") "," TRACE_DISABLED_BY_DEFAULT("gpu_decoder"));
 
   TestYUVReadback(800, 400, 800, 400, 0, 0, 1, false, true,
@@ skipping 60 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     ,
     YUVReadbackPixelTest,
     ::testing::Combine(
         ::testing::Bool(),
         ::testing::Bool(),
         ::testing::Range<unsigned int>(0, arraysize(kYUVReadbackSizes)),
         ::testing::Range<unsigned int>(0, arraysize(kYUVReadbackSizes))));
 
 }  // namespace display_compositor