Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

Index: webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 127a795e0b3d3e207f9bb3c9c78b93801568dd2f..56291ef18815c1f2474f8dca4b0a72fd1a1199f8 100644
--- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -227,11 +227,13 @@ class MockRtpRtcp : public RtpRtcp {
   MOCK_METHOD1(SetTargetSendBitrate,
       void(uint32_t bitrate_bps));
   MOCK_METHOD3(SetGenericFECStatus,
-      int32_t(const bool enable,
-              const uint8_t payloadTypeRED,
-              const uint8_t payloadTypeFEC));
+               void(const bool enable,
+                    const uint8_t payload_type_red,
+                    const uint8_t payload_type_fec));
   MOCK_METHOD3(GenericFECStatus,
-      int32_t(bool& enable, uint8_t& payloadTypeRED, uint8_t& payloadTypeFEC));
+               void(bool& enable,
+                    uint8_t& payloadTypeRED,
+                    uint8_t& payloadTypeFEC));
   MOCK_METHOD2(SetFecParameters,
       int32_t(const FecProtectionParams* delta_params,
               const FecProtectionParams* key_params));