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

media/base/android/media_codec_player_unittest.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 <stdint.h>
 #include <memory>
 #include <utility>
 
@@ skipping 577 matching lines @@
                              const char* test_name);
 
   // Callback sent when demuxer is being deleted.
   void OnDemuxerDeleted() { demuxer_ = nullptr; }
 
   bool IsDemuxerDeleted() const { return !demuxer_; }
 
   base::MessageLoop message_loop_;
   MockMediaPlayerManager manager_;
   MockDemuxerAndroid* demuxer_;  // owned by player_
-  scoped_refptr<gfx::SurfaceTexture> surface_texture_a_;
-  scoped_refptr<gfx::SurfaceTexture> surface_texture_b_;
+  scoped_refptr<gl::SurfaceTexture> surface_texture_a_;
+  scoped_refptr<gl::SurfaceTexture> surface_texture_b_;
   MediaCodecPlayer* player_;     // raw pointer due to DeleteOnCorrectThread()
 
  private:
   bool is_timeout_expired() const { return is_timeout_expired_; }
   void SetTimeoutExpired(bool value) { is_timeout_expired_ = value; }
 
   bool is_timeout_expired_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayerTest);
 };
@@ skipping 35 matching lines @@
       0,  // player_id
       manager_.GetWeakPtr(),
       base::Bind(&MockMediaPlayerManager::OnMediaResourcesRequested,
                  base::Unretained(&manager_)),
       base::WrapUnique(demuxer_), GURL(), kDefaultMediaSessionId);
 
   DCHECK(player_);
 }
 
 void MediaCodecPlayerTest::SetVideoSurface() {
-  surface_texture_a_ = gfx::SurfaceTexture::Create(0);
-  gfx::ScopedJavaSurface surface(surface_texture_a_.get());
+  surface_texture_a_ = gl::SurfaceTexture::Create(0);
+  gl::ScopedJavaSurface surface(surface_texture_a_.get());
 
   ASSERT_NE(nullptr, player_);
   player_->SetVideoSurface(std::move(surface));
 }
 
 void MediaCodecPlayerTest::SetVideoSurfaceB() {
-  surface_texture_b_ = gfx::SurfaceTexture::Create(1);
-  gfx::ScopedJavaSurface surface(surface_texture_b_.get());
+  surface_texture_b_ = gl::SurfaceTexture::Create(1);
+  gl::ScopedJavaSurface surface(surface_texture_b_.get());
 
   ASSERT_NE(nullptr, player_);
   player_->SetVideoSurface(std::move(surface));
 }
 
 void MediaCodecPlayerTest::RemoveVideoSurface() {
-  player_->SetVideoSurface(gfx::ScopedJavaSurface());
+  player_->SetVideoSurface(gl::ScopedJavaSurface());
   surface_texture_a_ = NULL;
 }
 
 bool MediaCodecPlayerTest::WaitForCondition(const Predicate& condition,
                                             const base::TimeDelta& timeout) {
   // Let the message_loop_ process events.
   // We start the timer and RunUntilIdle() until it signals.
 
   SetTimeoutExpired(false);
 
@@ skipping 1586 matching lines @@
   // TODO(timav): maybe we should not call the testing callback for
   // kRenderAfterPreroll for video (for audio we already do not call).
   // EXPECT_TRUE(AlmostEqual(manager_.FirstFrameTime(DemuxerStream::AUDIO),
   //                        manager_.FirstFrameTime(DemuxerStream::VIDEO), 50));
 
   // The playback should start at |seek_position|
   EXPECT_TRUE(AlmostEqual(seek_position, manager_.pts_stat_.min(), 25));
 }
 
 }  // namespace media