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

media/base/android/media_codec_player.cc

 // Copyright 2015 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/base/android/media_codec_player.h"
 
 #include <utility>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
@@ skipping 126 matching lines @@
   DetachListener();
 
   // The base class part that deals with MediaPlayerListener
   // has to be destroyed on UI thread.
   DestroyListenerOnUIThread();
 
   // Post deletion onto Media thread
   GetMediaTaskRunner()->DeleteSoon(FROM_HERE, this);
 }
 
-void MediaCodecPlayer::SetVideoSurface(gfx::ScopedJavaSurface surface) {
+void MediaCodecPlayer::SetVideoSurface(gl::ScopedJavaSurface surface) {
   RUN_ON_MEDIA_THREAD(SetVideoSurface, base::Passed(&surface));
 
   DVLOG(1) << __FUNCTION__ << (surface.IsEmpty() ? " empty" : " non-empty");
 
   // Save the empty-ness before we pass the surface to the decoder.
   bool surface_is_empty = surface.IsEmpty();
 
   // Apparently RemoveVideoSurface() can be called several times in a row,
   // ignore the second and subsequent calls.
   if (surface_is_empty && !video_decoder_->HasVideoSurface()) {
@@ skipping 1255 matching lines @@
     RETURN_STRING(kStateWaitingForMediaCrypto);
     RETURN_STRING(kStateWaitingForSeek);
     RETURN_STRING(kStateError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media