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

ui/compositor/test/in_process_context_provider.cc

 // Copyright (c) 2013 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 "ui/compositor/test/in_process_context_provider.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 65 matching lines @@
 InProcessContextProvider::~InProcessContextProvider() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 }
 
 bool InProcessContextProvider::BindToCurrentThread() {
   // This is called on the thread the context will be used.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (!context_) {
-    gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
+    gl::GpuPreference gpu_preference = gl::PreferDiscreteGpu;
     context_.reset(gpu::GLInProcessContext::Create(
         nullptr,  /* service */
         nullptr,  /* surface */
         !window_, /* is_offscreen */
         window_, gfx::Size(1, 1),
         (shared_context_ ? shared_context_->context_.get() : nullptr), attribs_,
         gpu_preference, gpu::SharedMemoryLimits(), gpu_memory_buffer_manager_,
         image_factory_));
 
     if (!context_)
@@ skipping 57 matching lines @@
   if (gr_context_)
     gr_context_->FreeGpuResources();
 }
 
 void InProcessContextProvider::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   // Pixel tests do not test lost context.
 }
 
 }  // namespace ui