| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index 26700f6153d82f7f65d6264c864b05245033b1b0..08ad5c7fa371ba1e93dab402a406e805fb0852d0 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -129,7 +129,7 @@ class MockVideoRenderer : public VideoRenderer {
|
| const BufferingStateCB& buffering_state_cb,
|
| const base::Closure& ended_cb,
|
| const PipelineStatusCB& error_cb,
|
| - const WallClockTimeCB& wall_clock_time_cb,
|
| + const TimeSource::WallClockTimeCB& wall_clock_time_cb,
|
| const base::Closure& waiting_for_decryption_key_cb));
|
| MOCK_METHOD1(Flush, void(const base::Closure& callback));
|
| MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta));
|
| @@ -203,7 +203,7 @@ class MockTimeSource : public TimeSource {
|
| MOCK_METHOD1(SetPlaybackRate, void(double));
|
| MOCK_METHOD1(SetMediaTime, void(base::TimeDelta));
|
| MOCK_METHOD0(CurrentMediaTime, base::TimeDelta());
|
| - MOCK_METHOD1(GetWallClockTime, base::TimeTicks(base::TimeDelta));
|
| + MOCK_METHOD2(GetWallClockTime, base::TimeTicks(base::TimeDelta, int));
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(MockTimeSource);
|
|
|