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

media/base/android/video_decoder_job.cc

 // Copyright 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/base/android/video_decoder_job.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 24 matching lines @@
                       on_demuxer_config_changed_cb),
       video_codec_(kUnknownVideoCodec),
       config_width_(0),
       config_height_(0),
       output_width_(0),
       output_height_(0) {
 }
 
 VideoDecoderJob::~VideoDecoderJob() {}
 
-bool VideoDecoderJob::SetVideoSurface(gfx::ScopedJavaSurface surface) {
+bool VideoDecoderJob::SetVideoSurface(gl::ScopedJavaSurface surface) {
   // For an empty surface, always pass it to the |media_codec_bridge_| job so
   // that it can detach from the current one. Otherwise, don't pass an
   // unprotected surface if the video content requires a protected one.
   if (!surface.IsEmpty() && IsProtectedSurfaceRequired() &&
       !surface.is_protected()) {
     return false;
   }
 
   surface_ = std::move(surface);
   need_to_reconfig_decoder_job_ = true;
   return true;
 }
 
 bool VideoDecoderJob::HasStream() const {
   return video_codec_ != kUnknownVideoCodec;
 }
 
 void VideoDecoderJob::ReleaseDecoderResources() {
   MediaDecoderJob::ReleaseDecoderResources();
-  surface_ = gfx::ScopedJavaSurface();
+  surface_ = gl::ScopedJavaSurface();
 }
 
 void VideoDecoderJob::SetDemuxerConfigs(const DemuxerConfigs& configs) {
   video_codec_ = configs.video_codec;
   config_width_ = configs.video_size.width();
   config_height_ = configs.video_size.height();
   set_is_content_encrypted(configs.is_video_encrypted);
   if (!media_codec_bridge_) {
     output_width_ = config_width_;
     output_height_ = config_height_;
@@ skipping 84 matching lines @@
   return (output_width_ != prev_output_width) ||
       (output_height_ != prev_output_height);
 }
 
 bool VideoDecoderJob::IsProtectedSurfaceRequired() {
   return is_content_encrypted() && drm_bridge() &&
       drm_bridge()->IsProtectedSurfaceRequired();
 }
 
 }  // namespace media