| Index: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
 | 
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
 | 
| index c15515dc487bdb9720202aaffd1f3a6ed08bff0f..3f41d337c9c2adbbaff11f41a9d5bb9a719f9931 100644
 | 
| --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
 | 
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
 | 
| @@ -11,6 +11,7 @@
 | 
|  #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
 | 
|  #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
 | 
|  
 | 
| +#include <memory>
 | 
|  #include <set>
 | 
|  #include <utility>
 | 
|  #include <vector>
 | 
| @@ -57,8 +58,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
 | 
|  
 | 
|    int32_t DeRegisterSendPayload(int8_t payload_type) override;
 | 
|  
 | 
| -  int8_t SendPayloadType() const;
 | 
| -
 | 
|    // Register RTP header extension.
 | 
|    int32_t RegisterSendRtpHeaderExtension(RTPExtensionType type,
 | 
|                                           uint8_t id) override;
 | 
| @@ -314,7 +313,7 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
 | 
|   protected:
 | 
|    bool UpdateRTCPReceiveInformationTimers();
 | 
|  
 | 
| -  RTPSender rtp_sender_;
 | 
| +  std::unique_ptr<RTPSender> rtp_sender_;
 | 
|  
 | 
|    RTCPSender rtcp_sender_;
 | 
|    RTCPReceiver rtcp_receiver_;
 | 
| 
 |