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

media/base/android/media_source_player_unittest.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/media_source_player.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <utility>
@@ skipping 687 matching lines @@
   }
 
   void EnableAdaptiveVideoPlayback(bool enable) {
     EXPECT_TRUE(GetMediaCodecBridge(false));
     static_cast<VideoCodecBridge*>(GetMediaCodecBridge(false))->
         set_adaptive_playback_supported_for_testing(
             enable ? 1 : 0);
   }
 
   void CreateNextTextureAndSetVideoSurface() {
-    gfx::SurfaceTexture* surface_texture;
+    gl::SurfaceTexture* surface_texture;
     if (surface_texture_a_is_next_) {
-      surface_texture_a_ = gfx::SurfaceTexture::Create(next_texture_id_++);
+      surface_texture_a_ = gl::SurfaceTexture::Create(next_texture_id_++);
       surface_texture = surface_texture_a_.get();
     } else {
-      surface_texture_b_ = gfx::SurfaceTexture::Create(next_texture_id_++);
+      surface_texture_b_ = gl::SurfaceTexture::Create(next_texture_id_++);
       surface_texture = surface_texture_b_.get();
     }
 
     surface_texture_a_is_next_ = !surface_texture_a_is_next_;
-    gfx::ScopedJavaSurface surface = gfx::ScopedJavaSurface(surface_texture);
+    gl::ScopedJavaSurface surface = gl::ScopedJavaSurface(surface_texture);
     player_.SetVideoSurface(std::move(surface));
   }
 
   // Wait for one or both of the jobs to complete decoding. Media codec bridges
   // are assumed to exist for any stream whose decode completion is awaited.
   void WaitForDecodeDone(bool wait_for_audio, bool wait_for_video) {
     DCHECK(wait_for_audio || wait_for_video);
     while ((wait_for_audio && GetMediaCodecBridge(true) &&
                GetMediaDecoderJob(true)->HasData() &&
                GetMediaDecoderJob(true)->is_decoding()) ||
@@ skipping 117 matching lines @@
   // Track whether a possibly async decoder callback test hook has run.
   bool decoder_callback_hook_executed_;
 
   // We need to keep the surface texture while the decoder is actively decoding.
   // Otherwise, it may trigger unexpected crashes on some devices. To switch
   // surfaces, tests need to create a new surface texture without releasing
   // their previous one. In CreateNextTextureAndSetVideoSurface(), we toggle
   // between two surface textures, only replacing the N-2 texture. Assumption is
   // that no more than N-1 texture is in use by decoder when
   // CreateNextTextureAndSetVideoSurface() is called.
-  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_;
   bool surface_texture_a_is_next_;
   int next_texture_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayerTest);
 };
 
 TEST_F(MediaSourcePlayerTest, StartAudioDecoderWithValidConfig) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   // Test audio codec will be created when valid configs and data are passed to
@@ skipping 42 matching lines @@
   // Send the first input chunk and verify that decoder will be created.
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo(false));
   EXPECT_TRUE(GetMediaCodecBridge(false));
   WaitForVideoDecodeDone();
 }
 
 TEST_F(MediaSourcePlayerTest, StartVideoCodecWithInvalidSurface) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   // Test video codec will not be created when surface is invalid.
-  scoped_refptr<gfx::SurfaceTexture> surface_texture(
-      gfx::SurfaceTexture::Create(0));
-  gfx::ScopedJavaSurface surface(surface_texture.get());
+  scoped_refptr<gl::SurfaceTexture> surface_texture(
+      gl::SurfaceTexture::Create(0));
+  gl::ScopedJavaSurface surface(surface_texture.get());
   StartVideoDecoderJob();
 
   // Release the surface texture.
   surface_texture = NULL;
   player_.SetVideoSurface(std::move(surface));
 
   // Player should not seek the demuxer on setting initial surface.
   EXPECT_EQ(0, demuxer_->num_seek_requests());
   EXPECT_EQ(1, demuxer_->num_data_requests());
 
@@ skipping 48 matching lines @@
   // Test MediaSourcePlayer can switch multiple surfaces during decoding.
   CreateNextTextureAndSetVideoSurface();
   StartVideoDecoderJob();
   EXPECT_EQ(0, demuxer_->num_seek_requests());
 
   // Send the first input chunk.
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo(false));
 
   // While the decoder is decoding, change multiple surfaces. Pass an empty
   // surface first.
-  gfx::ScopedJavaSurface empty_surface;
+  gl::ScopedJavaSurface empty_surface;
   player_.SetVideoSurface(std::move(empty_surface));
   // Next, pass a new non-empty surface.
   CreateNextTextureAndSetVideoSurface();
 
   // Wait for the media codec bridge to finish decoding and be reset pending a
   // browser seek.
   WaitForVideoDecodeDone();
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo(false));
 
   // Only one browser seek should have been initiated. No further data request
@@ skipping 20 matching lines @@
 
   // Test player pauses if an empty surface is passed.
   CreateNextTextureAndSetVideoSurface();
   StartVideoDecoderJob();
   EXPECT_EQ(1, demuxer_->num_data_requests());
 
   // Send the first input chunk.
   player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo(false));
 
   // While the decoder is decoding, pass an empty surface.
-  gfx::ScopedJavaSurface empty_surface;
+  gl::ScopedJavaSurface empty_surface;
   player_.SetVideoSurface(std::move(empty_surface));
   // Let the player starve. However, it should not issue any new data request in
   // this case.
   TriggerPlayerStarvation();
   // Wait for the media codec bridge to finish decoding and be reset.
   while (GetMediaDecoderJob(false)->is_decoding())
     message_loop_.RunUntilIdle();
 
   // No further seek or data requests should have been received since the
   // surface is empty.
@@ skipping 1375 matching lines @@
 
   EXPECT_EQ(demuxer_->num_data_requests(), 0);
   player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true));
 
   manager_.set_allow_play(true);
   player_.Start();
   EXPECT_TRUE(player_.IsPlaying());
 }
 
 }  // namespace media