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

media/base/android/media_player_android.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 46 matching lines @@
   static const double kDefaultVolumeMultiplier;
 
   // Callback when the player releases decoding resources.
   typedef base::Callback<void(int player_id)> OnDecoderResourcesReleasedCB;
 
   // Virtual destructor.
   // For most subclasses we can delete on the caller thread.
   virtual void DeleteOnCorrectThread();
 
   // Passing an external java surface object to the player.
-  virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) = 0;
+  virtual void SetVideoSurface(gl::ScopedJavaSurface surface) = 0;
 
   // Start playing the media.
   virtual void Start() = 0;
 
   // Pause the media.
   virtual void Pause(bool is_media_related_action) = 0;
 
   // Seek to a particular position, based on renderer signaling actual seek
   // with MediaPlayerHostMsg_Seek. If eventual success, OnSeekComplete() will be
   // called.
@@ skipping 119 matching lines @@
   // Weak pointer passed to |listener_| for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_