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

content/browser/gpu/gpu_surface_tracker.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 "content/browser/gpu/gpu_surface_tracker.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
@@ skipping 40 matching lines @@
 
 #if defined(OS_ANDROID)
   if (it->second != gfx::kNullAcceleratedWidget)
     ANativeWindow_acquire(it->second);
 #endif  // defined(OS_ANDROID)
 
   return it->second;
 }
 
 #if defined(OS_ANDROID)
-gfx::ScopedJavaSurface GpuSurfaceTracker::AcquireJavaSurface(int surface_id) {
+gl::ScopedJavaSurface GpuSurfaceTracker::AcquireJavaSurface(int surface_id) {
   return GetViewSurface(surface_id);
 }
 #endif
 
 std::size_t GpuSurfaceTracker::GetSurfaceCount() {
   base::AutoLock lock(lock_);
   return surface_map_.size();
 }
 
 }  // namespace content