| Index: media/cast/net/rtp/mock_rtp_feedback.h
|
| diff --git a/media/cast/net/rtp/mock_rtp_feedback.h b/media/cast/net/rtp/mock_rtp_feedback.h
|
| index 95420812c9ca9cae6c9d812d693e315aaaa8d1ae..b5a3a681723ad5d6d5681a7a15bc8fcbb2883ae0 100644
|
| --- a/media/cast/net/rtp/mock_rtp_feedback.h
|
| +++ b/media/cast/net/rtp/mock_rtp_feedback.h
|
| @@ -14,19 +14,20 @@ namespace cast {
|
| class MockRtpFeedback : public RtpFeedback {
|
| public:
|
| MOCK_METHOD4(OnInitializeDecoder,
|
| - int32(const int8 payloadType,
|
| - const int frequency,
|
| - const uint8 channels,
|
| - const uint32 rate));
|
| + int32_t(const int8_t payloadType,
|
| + const int frequency,
|
| + const uint8_t channels,
|
| + const uint32_t rate));
|
|
|
| - MOCK_METHOD1(OnPacketTimeout, void(const int32 id));
|
| + MOCK_METHOD1(OnPacketTimeout, void(const int32_t id));
|
| MOCK_METHOD2(OnReceivedPacket,
|
| - void(const int32 id, const RtpRtcpPacketField packet_type));
|
| + void(const int32_t id, const RtpRtcpPacketField packet_type));
|
| MOCK_METHOD2(OnPeriodicDeadOrAlive,
|
| - void(const int32 id, const RTPAliveType alive));
|
| - MOCK_METHOD2(OnIncomingSSRCChanged, void(const int32 id, const uint32 ssrc));
|
| + void(const int32_t id, const RTPAliveType alive));
|
| + MOCK_METHOD2(OnIncomingSSRCChanged,
|
| + void(const int32_t id, const uint32_t ssrc));
|
| MOCK_METHOD3(OnIncomingCSRCChanged,
|
| - void(const int32 id, const uint32 csrc, const bool added));
|
| + void(const int32_t id, const uint32_t csrc, const bool added));
|
| };
|
|
|
| } // namespace cast
|
|
|