| Index: media/gpu/android_video_decode_accelerator_unittest.cc
|
| diff --git a/media/gpu/android_video_decode_accelerator_unittest.cc b/media/gpu/android_video_decode_accelerator_unittest.cc
|
| index d8a119c75a9013adc35fde319e8483d936087888..aaa7afc6f253d6d7d5822606ba6550a6112f05d4 100644
|
| --- a/media/gpu/android_video_decode_accelerator_unittest.cc
|
| +++ b/media/gpu/android_video_decode_accelerator_unittest.cc
|
| @@ -37,8 +37,7 @@ static base::WeakPtr<gpu::gles2::GLES2Decoder> MockGetGLES2Decoder(
|
|
|
| namespace media {
|
|
|
| -class MockVideoDecodeAcceleratorClient
|
| - : public media::VideoDecodeAccelerator::Client {
|
| +class MockVideoDecodeAcceleratorClient : public VideoDecodeAccelerator::Client {
|
| public:
|
| MockVideoDecodeAcceleratorClient() {}
|
| ~MockVideoDecodeAcceleratorClient() override {}
|
| @@ -50,11 +49,11 @@ class MockVideoDecodeAcceleratorClient
|
| const gfx::Size& dimensions,
|
| uint32_t texture_target) override {}
|
| void DismissPictureBuffer(int32_t picture_buffer_id) override {}
|
| - void PictureReady(const media::Picture& picture) override {}
|
| + void PictureReady(const Picture& picture) override {}
|
| void NotifyEndOfBitstreamBuffer(int32_t bitstream_buffer_id) override {}
|
| void NotifyFlushDone() override {}
|
| void NotifyResetDone() override {}
|
| - void NotifyError(media::VideoDecodeAccelerator::Error error) override {}
|
| + void NotifyError(VideoDecodeAccelerator::Error error) override {}
|
| };
|
|
|
| class AndroidVideoDecodeAcceleratorTest : public testing::Test {
|
| @@ -64,7 +63,7 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test {
|
| protected:
|
| void SetUp() override {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - media::RegisterJni(env);
|
| + RegisterJni(env);
|
|
|
| // Start message loop because
|
| // AndroidVideoDecodeAccelerator::ConfigureMediaCodec() starts a timer task.
|
| @@ -79,7 +78,7 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test {
|
| base::Bind(&MockGetGLES2Decoder, decoder->AsWeakPtr())));
|
| }
|
|
|
| - bool Configure(media::VideoCodec codec) {
|
| + bool Configure(VideoCodec codec) {
|
| AndroidVideoDecodeAccelerator* accelerator =
|
| static_cast<AndroidVideoDecodeAccelerator*>(accelerator_.get());
|
| scoped_refptr<gl::SurfaceTexture> surface_texture =
|
| @@ -91,18 +90,18 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test {
|
| }
|
|
|
| private:
|
| - std::unique_ptr<media::VideoDecodeAccelerator> accelerator_;
|
| + std::unique_ptr<VideoDecodeAccelerator> accelerator_;
|
| std::unique_ptr<base::MessageLoop> message_loop_;
|
| };
|
|
|
| TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureUnsupportedCodec) {
|
| - EXPECT_FALSE(Configure(media::kUnknownVideoCodec));
|
| + EXPECT_FALSE(Configure(kUnknownVideoCodec));
|
| }
|
|
|
| TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureSupportedCodec) {
|
| - if (!media::MediaCodecUtil::IsMediaCodecAvailable())
|
| + if (!MediaCodecUtil::IsMediaCodecAvailable())
|
| return;
|
| - EXPECT_TRUE(Configure(media::kCodecVP8));
|
| + EXPECT_TRUE(Configure(kCodecVP8));
|
| }
|
|
|
| } // namespace media
|
|
|