| Index: media/filters/mock_gpu_video_accelerator_factories.h
|
| diff --git a/media/filters/mock_gpu_video_accelerator_factories.h b/media/filters/mock_gpu_video_accelerator_factories.h
|
| index 91a45e86681b99c369e7b61004c8679d73d26676..2969d289d09000e13192d83981d1618faf60288b 100644
|
| --- a/media/filters/mock_gpu_video_accelerator_factories.h
|
| +++ b/media/filters/mock_gpu_video_accelerator_factories.h
|
| @@ -28,11 +28,9 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
|
|
|
| // CreateVideo{Decode,Encode}Accelerator returns scoped_ptr, which the mocking
|
| // framework does not want. Trampoline them.
|
| - MOCK_METHOD2(DoCreateVideoDecodeAccelerator,
|
| - VideoDecodeAccelerator*(VideoCodecProfile,
|
| - VideoDecodeAccelerator::Client*));
|
| - MOCK_METHOD1(DoCreateVideoEncodeAccelerator,
|
| - VideoEncodeAccelerator*(VideoEncodeAccelerator::Client*));
|
| + MOCK_METHOD1(DoCreateVideoDecodeAccelerator,
|
| + VideoDecodeAccelerator*(VideoCodecProfile));
|
| + MOCK_METHOD0(DoCreateVideoEncodeAccelerator, VideoEncodeAccelerator*());
|
|
|
| MOCK_METHOD5(CreateTextures,
|
| uint32(int32 count,
|
| @@ -50,11 +48,10 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
|
| MOCK_METHOD0(GetTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());
|
|
|
| virtual scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator(
|
| - VideoCodecProfile profile,
|
| - VideoDecodeAccelerator::Client* client) OVERRIDE;
|
| + VideoCodecProfile profile) OVERRIDE;
|
|
|
| - virtual scoped_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator(
|
| - VideoEncodeAccelerator::Client* client) OVERRIDE;
|
| + virtual scoped_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator()
|
| + OVERRIDE;
|
|
|
| private:
|
| virtual ~MockGpuVideoAcceleratorFactories();
|
|
|