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

media/gpu/android_video_decode_accelerator.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 "media/gpu/android_video_decode_accelerator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 115 matching lines @@
 // SurfaceTexture will quit sending callbacks to coordinate with the
 // destruction of the AVDA, so we have a separate object that the cb can own.
 class AndroidVideoDecodeAccelerator::OnFrameAvailableHandler
     : public base::RefCountedThreadSafe<OnFrameAvailableHandler> {
  public:
   // We do not retain ownership of |owner|.  It must remain valid until
   // after ClearOwner() is called.  This will register with
   // |surface_texture| to receive OnFrameAvailable callbacks.
   OnFrameAvailableHandler(
       AndroidVideoDecodeAccelerator* owner,
-      const scoped_refptr<gfx::SurfaceTexture>& surface_texture)
+      const scoped_refptr<gl::SurfaceTexture>& surface_texture)
       : owner_(owner) {
     // Note that the callback owns a strong ref to us.
     surface_texture->SetFrameAvailableCallbackOnAnyThread(
         base::Bind(&OnFrameAvailableHandler::OnFrameAvailable,
                    scoped_refptr<OnFrameAvailableHandler>(this)));
   }
 
   // Forget about our owner, which is required before one deletes it.
   // No further callbacks will happen once this completes.
   void ClearOwner() {
@@ skipping 372 matching lines @@
     return false;
   }
 
   on_destroying_surface_cb_ =
       base::Bind(&AndroidVideoDecodeAccelerator::OnDestroyingSurface,
                  weak_this_factory_.GetWeakPtr());
   AVDASurfaceTracker::GetInstance()->RegisterOnDestroyingSurfaceCallback(
       on_destroying_surface_cb_);
 
   // TODO(watk,liberato): move this into the strategy.
-  scoped_refptr<gfx::SurfaceTexture> surface_texture =
+  scoped_refptr<gl::SurfaceTexture> surface_texture =
       strategy_->GetSurfaceTexture();
   if (surface_texture) {
     on_frame_available_handler_ =
         new OnFrameAvailableHandler(this, surface_texture);
   }
 
   // Start the thread for async configuration, even if we don't need it now.
   // ResetCodecState might rebuild the codec later, for example.
   if (!g_avda_timer.Pointer()->StartThread(this)) {
     LOG(ERROR) << "Failed to start AVDA thread";
@@ skipping 1088 matching lines @@
     if (media::MediaCodecUtil::IsSurfaceViewOutputSupported()) {
       capabilities.flags |= media::VideoDecodeAccelerator::Capabilities::
           SUPPORTS_EXTERNAL_OUTPUT_SURFACE;
     }
   }
 
   return capabilities;
 }
 
 }  // namespace media