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

gpu/command_buffer/service/gpu_tracer.cc

 // 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 "gpu/command_buffer/service/gpu_tracer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
@@ skipping 107 matching lines @@
   trace_service_id_stack_[source].pop();
 
   TRACE_EVENT_COPY_NESTABLE_ASYNC_END_WITH_TTS2(
       TRACE_DISABLED_BY_DEFAULT("gpu.service"),
       name.c_str(), local_trace_id,
       "gl_category", category.c_str(),
       "channel", kGpuTraceSourceNames[source]);
 }
 
 GPUTrace::GPUTrace(scoped_refptr<Outputter> outputter,
-                   gfx::GPUTimingClient* gpu_timing_client,
+                   gl::GPUTimingClient* gpu_timing_client,
                    const GpuTracerSource source,
                    const std::string& category,
                    const std::string& name,
                    const bool tracing_service,
                    const bool tracing_device)
     : source_(source),
       category_(category),
       name_(name),
       outputter_(outputter),
       service_enabled_(tracing_service),
@@ skipping 44 matching lines @@
   }
 }
 
 GPUTracer::GPUTracer(gles2::GLES2Decoder* decoder)
     : gpu_trace_srv_category(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
           TRACE_DISABLED_BY_DEFAULT("gpu.service"))),
       gpu_trace_dev_category(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
           TRACE_DISABLED_BY_DEFAULT("gpu.device"))),
       decoder_(decoder) {
   DCHECK(decoder_);
-  gfx::GLContext* context = decoder_->GetGLContext();
+  gl::GLContext* context = decoder_->GetGLContext();
   if (context) {
     gpu_timing_client_ = context->CreateGPUTimingClient();
   } else {
-    gpu_timing_client_ = new gfx::GPUTimingClient();
+    gpu_timing_client_ = new gl::GPUTimingClient();
   }
 
   disjoint_time_ = gpu_timing_client_->GetCurrentCPUTime();
 }
 
 GPUTracer::~GPUTracer() {
 }
 
 void GPUTracer::Destroy(bool have_context) {
   ClearOngoingTraces(have_context);
@@ skipping 204 matching lines @@
   }
 
   while (!finished_traces_.empty()) {
     finished_traces_.front()->Destroy(have_context);
     finished_traces_.pop_front();
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu