diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-11-12 12:21:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-12 20:22:30 +0000 |
| commit | 8d64b57888d3859d25d2bb69e4fbf3a66e6471ca (patch) | |
| tree | a250b4f6aa3b5bd88f31dabb63a9a5ae311247aa /content | |
| parent | 574aa34d5b5f7292aa212c0445a71dc3c28f2593 (diff) | |
| download | chromium_src-8d64b57888d3859d25d2bb69e4fbf3a66e6471ca.zip chromium_src-8d64b57888d3859d25d2bb69e4fbf3a66e6471ca.tar.gz chromium_src-8d64b57888d3859d25d2bb69e4fbf3a66e6471ca.tar.bz2 | |
Fix AndroidVideoDecodeAcceleratorTest.ConfigureSupportedCodec
TEST=None
Review URL: https://codereview.chromium.org/1434793003
Cr-Commit-Position: refs/heads/master@{#359374}
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/gpu/media/android_video_decode_accelerator_unittest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc index 98534d4..2e0e7ac2 100644 --- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/message_loop/message_loop.h" #include "content/common/gpu/media/android_copying_backing_strategy.h" #include "content/common/gpu/media/android_video_decode_accelerator.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" @@ -59,6 +60,11 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test { media::RegisterJni(env); // TODO(felipeg): fix GL bindings, so that the decoder can perform GL // calls. + + // Start message loop because + // AndroidVideoDecodeAccelerator::ConfigureMediaCodec() starts a timer task. + message_loop_.reset(new base::MessageLoop()); + scoped_ptr<gpu::gles2::MockGLES2Decoder> decoder( new gpu::gles2::MockGLES2Decoder()); scoped_ptr<MockVideoDecodeAcceleratorClient> client( @@ -78,6 +84,7 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test { private: scoped_ptr<media::VideoDecodeAccelerator> accelerator_; + scoped_ptr<base::MessageLoop> message_loop_; }; TEST_F(AndroidVideoDecodeAcceleratorTest, ConfigureUnsupportedCodec) { |