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

cc/tiles/gpu_image_decode_controller.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 "cc/tiles/gpu_image_decode_controller.h"
 
 #include "base/memory/discardable_memory_allocator.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/stringprintf.h"
@@ skipping 393 matching lines @@
                       base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                       image_data->size);
 
       // Create a global shred GUID to associate this data with its GPU process
       // counterpart.
       GLuint gl_id = skia::GrBackendObjectToGrGLTextureInfo(
                          image_data->upload.image->getTextureHandle(
                              false /* flushPendingGrContextIO */))
                          ->fID;
       base::trace_event::MemoryAllocatorDumpGuid guid =
-          gfx::GetGLTextureClientGUIDForTracing(
+          gl::GetGLTextureClientGUIDForTracing(
               context_->ContextSupport()->ShareGroupTracingGUID(), gl_id);
 
       // kImportance is somewhat arbitrary - we chose 3 to be higher than the
       // value used in the GPU process (1), and Skia (2), causing us to appear
       // as the owner in memory traces.
       const int kImportance = 3;
       pmd->CreateSharedGlobalAllocatorDump(guid);
       pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
     }
   }
@@ skipping 433 matching lines @@
 bool GpuImageDecodeController::DiscardableIsLockedForTesting(
     const DrawImage& image) {
   base::AutoLock lock(lock_);
   auto found = image_data_.Peek(image.image()->uniqueID());
   DCHECK(found != image_data_.end());
   ImageData* image_data = found->second.get();
   return image_data->decode.is_locked;
 }
 
 }  // namespace cc