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

content/browser/gpu/gpu_surface_tracker.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_SURFACE_TRACKER_H_
 #define CONTENT_BROWSER_GPU_GPU_SURFACE_TRACKER_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 21 matching lines @@
 // This class is thread safe.
 class CONTENT_EXPORT GpuSurfaceTracker : public gpu::GpuSurfaceLookup {
  public:
   // GpuSurfaceLookup implementation:
   // Returns the native widget associated with a given surface_handle.
   // On Android, this adds a reference on the ANativeWindow.
   gfx::AcceleratedWidget AcquireNativeWidget(
       gpu::SurfaceHandle surface_handle) override;
 
 #if defined(OS_ANDROID)
-  gfx::ScopedJavaSurface AcquireJavaSurface(int surface_id) override;
+  gl::ScopedJavaSurface AcquireJavaSurface(int surface_id) override;
 #endif
 
   // Gets the global instance of the surface tracker.
   static GpuSurfaceTracker* Get() { return GetInstance(); }
 
   // Adds a surface for a native widget. Returns the surface ID.
   int AddSurfaceForNativeWidget(gfx::AcceleratedWidget widget);
 
   // Removes a given existing surface.
   void RemoveSurface(gpu::SurfaceHandle surface_handle);
@@ skipping 16 matching lines @@
   base::Lock lock_;
   SurfaceMap surface_map_;
   int next_surface_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuSurfaceTracker);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_SURFACE_TRACKER_H_