Chromium Code Reviews| Index: media/cast/video_sender/external_video_encoder_unittest.cc |
| diff --git a/media/cast/video_sender/external_video_encoder_unittest.cc b/media/cast/video_sender/external_video_encoder_unittest.cc |
| index 8f9b2f7f66dea75f7b95bca847a175b65f1ea6a7..28effbd852ae5fa3b814a3749ff588d34e9b6ee1 100644 |
| --- a/media/cast/video_sender/external_video_encoder_unittest.cc |
| +++ b/media/cast/video_sender/external_video_encoder_unittest.cc |
| @@ -10,7 +10,6 @@ |
| #include "media/base/video_frame.h" |
| #include "media/cast/cast_defines.h" |
| #include "media/cast/cast_environment.h" |
| -#include "media/cast/test/fake_gpu_video_accelerator_factories.h" |
| #include "media/cast/test/fake_single_thread_task_runner.h" |
| #include "media/cast/test/fake_video_encode_accelerator.h" |
| #include "media/cast/test/utility/video_utility.h" |
| @@ -23,6 +22,27 @@ namespace cast { |
| using testing::_; |
| namespace { |
| + |
| +void CreateVideoEncodeAccelerator( |
| + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| + scoped_ptr<VideoEncodeAccelerator> fake_vea, |
| + const base::Callback<void(scoped_refptr<base::SingleThreadTaskRunner>, |
|
pwestin
2014/03/21 21:02:02
Use the proposed typedef
Alpha Left Google
2014/03/21 21:37:12
Done.
|
| + scoped_ptr<media::VideoEncodeAccelerator>)>& |
| + callback) { |
| + callback.Run(task_runner, fake_vea.Pass()); |
| +} |
| + |
| +void CreateSharedMemory( |
| + size_t size, |
| + const base::Callback<void(scoped_ptr<base::SharedMemory>)>& callback) { |
|
pwestin
2014/03/21 21:02:02
Use the proposed typedef
Alpha Left Google
2014/03/21 21:37:12
Done.
|
| + scoped_ptr<base::SharedMemory> shm(new base::SharedMemory()); |
| + if (!shm->CreateAndMapAnonymous(size)) { |
| + NOTREACHED(); |
| + return; |
| + } |
| + callback.Run(shm.Pass()); |
| +} |
| + |
| class TestVideoEncoderCallback |
| : public base::RefCountedThreadSafe<TestVideoEncoderCallback> { |
| public: |
| @@ -97,10 +117,15 @@ class ExternalVideoEncoderTest : public ::testing::Test { |
| task_runner_, |
| task_runner_, |
| GetDefaultCastSenderLoggingConfig()); |
| - video_encoder_.reset(new ExternalVideoEncoder( |
| - cast_environment_, |
| - video_config_, |
| - new test::FakeGpuVideoAcceleratorFactories(task_runner_))); |
| + scoped_ptr<VideoEncodeAccelerator> fake_vea( |
| + new test::FakeVideoEncodeAccelerator()); |
| + video_encoder_.reset( |
| + new ExternalVideoEncoder(cast_environment_, |
| + video_config_, |
| + base::Bind(&CreateVideoEncodeAccelerator, |
| + task_runner_, |
| + base::Passed(&fake_vea)), |
| + base::Bind(&CreateSharedMemory))); |
| } |
| virtual ~ExternalVideoEncoderTest() {} |