diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index e8f010c8ac..183755eff3 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -405,23 +405,6 @@ inline int32_t NullRtpFeedback::OnInitializeDecoder(
   return 0;
 }
 
-// Null object version of RtpData.
-class NullRtpData : public RtpData {
- public:
-  ~NullRtpData() override {}
-
-  int32_t OnReceivedPayloadData(const uint8_t* payload_data,
-                                size_t payload_size,
-                                const WebRtcRTPHeader* rtp_header) override;
-};
-
-inline int32_t NullRtpData::OnReceivedPayloadData(
-    const uint8_t* payload_data,
-    size_t payload_size,
-    const WebRtcRTPHeader* rtp_header) {
-  return 0;
-}
-
 // Statistics about packet loss for a single directional connection. All values
 // are totals since the connection initiated.
 struct RtpPacketLossStats {
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 1f494bfa62..d1b9bd485d 100644
--- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -31,9 +31,6 @@ class MockRtpData : public RtpData {
                int32_t(const uint8_t* payload_data,
                        size_t payload_size,
                        const WebRtcRTPHeader* rtp_header));
-
-  MOCK_METHOD2(OnRecoveredPacket,
-               bool(const uint8_t* packet, size_t packet_length));
 };
 
 class MockRtpRtcp : public RtpRtcp {
diff --git a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc
index 63378905d1..b987f114d2 100644
--- a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc
@@ -37,7 +37,7 @@ const int kPayloadType = 123;
 const int kRtxPayloadType = 98;
 const int64_t kMaxRttMs = 1000;
 
-class VerifyingRtxReceiver : public NullRtpData {
+class VerifyingRtxReceiver : public RtpData {
  public:
   VerifyingRtxReceiver() {}
 
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index 1d1877f793..2b368284ae 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -197,7 +197,7 @@ class RtcpPacketTypeCounterObserverImpl : public RtcpPacketTypeCounterObserver {
 };
 
 class TestTransport : public Transport,
-                      public NullRtpData {
+                      public RtpData {
  public:
   TestTransport() {}
 
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
index 2c19298948..01ccd2b260 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
@@ -36,8 +36,7 @@ RtpReceiver* RtpReceiver::CreateVideoReceiver(
     RtpData* incoming_payload_callback,
     RtpFeedback* incoming_messages_callback,
     RTPPayloadRegistry* rtp_payload_registry) {
-  if (!incoming_payload_callback)
-    incoming_payload_callback = NullObjectRtpData();
+  RTC_DCHECK(incoming_payload_callback != nullptr);
   if (!incoming_messages_callback)
     incoming_messages_callback = NullObjectRtpFeedback();
   return new RtpReceiverImpl(
@@ -50,8 +49,7 @@ RtpReceiver* RtpReceiver::CreateAudioReceiver(
     RtpData* incoming_payload_callback,
     RtpFeedback* incoming_messages_callback,
     RTPPayloadRegistry* rtp_payload_registry) {
-  if (!incoming_payload_callback)
-    incoming_payload_callback = NullObjectRtpData();
+  RTC_DCHECK(incoming_payload_callback != nullptr);
   if (!incoming_messages_callback)
     incoming_messages_callback = NullObjectRtpFeedback();
   return new RtpReceiverImpl(
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc
index a68f06e684..b0531c3c51 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_unittest.cc
@@ -15,6 +15,7 @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
@@ -22,6 +23,7 @@
 namespace webrtc {
 namespace {
 
+using ::testing::NiceMock;
 using ::testing::UnorderedElementsAre;
 
 const uint32_t kTestRate = 64000u;
@@ -46,7 +48,7 @@ class RtpReceiverTest : public ::testing::Test {
       : fake_clock_(123456),
         rtp_receiver_(
             RtpReceiver::CreateAudioReceiver(&fake_clock_,
-                                             nullptr,
+                                             &mock_rtp_data_,
                                              nullptr,
                                              &rtp_payload_registry_)) {
     CodecInst voice_codec = {};
@@ -73,6 +75,7 @@ class RtpReceiverTest : public ::testing::Test {
   }
 
   SimulatedClock fake_clock_;
+  NiceMock<MockRtpData> mock_rtp_data_;
   RTPPayloadRegistry rtp_payload_registry_;
   std::unique_ptr<RtpReceiver> rtp_receiver_;
 };
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
index 75e2dc17d1..783fe5eadd 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -50,7 +50,7 @@ class RtcpRttStatsTestImpl : public RtcpRttStats {
 };
 
 class SendTransport : public Transport,
-                      public NullRtpData {
+                      public RtpData {
  public:
   SendTransport()
       : receiver_(NULL),
@@ -88,6 +88,11 @@ class SendTransport : public Transport,
     EXPECT_EQ(0, receiver_->IncomingRtcpPacket(data, len));
     return true;
   }
+  int32_t OnReceivedPayloadData(const uint8_t* payload_data,
+                                size_t payload_size,
+                                const WebRtcRTPHeader* rtp_header) override {
+    return 0;
+  }
   ModuleRtpRtcpImpl* receiver_;
   SimulatedClock* clock_;
   int64_t delay_ms_;
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
index d003c0bdb0..06786cb27a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
@@ -19,11 +19,6 @@
 
 namespace webrtc {
 
-RtpData* NullObjectRtpData() {
-  static NullRtpData null_rtp_data;
-  return &null_rtp_data;
-}
-
 RtpFeedback* NullObjectRtpFeedback() {
   static NullRtpFeedback null_rtp_feedback;
   return &null_rtp_feedback;
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.h b/webrtc/modules/rtp_rtcp/source/rtp_utility.h
index 0e1d6610b9..54575e1bad 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.h
@@ -24,7 +24,6 @@ namespace webrtc {
 
 const uint8_t kRtpMarkerBitMask = 0x80;
 
-RtpData* NullObjectRtpData();
 RtpFeedback* NullObjectRtpFeedback();
 ReceiveStatistics* NullObjectReceiveStatistics();
 
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h b/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h
index 74548258ac..b2a0361d60 100644
--- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h
+++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h
@@ -51,7 +51,7 @@ class LoopBackTransport : public Transport {
   RtpRtcp* rtp_rtcp_module_;
 };
 
-class TestRtpReceiver : public NullRtpData {
+class TestRtpReceiver : public RtpData {
  public:
   int32_t OnReceivedPayloadData(
       const uint8_t* payload_data,
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
index 5e5d8eea49..548e4fa584 100644
--- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
+++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
@@ -47,7 +47,7 @@ bool IsComfortNoisePayload(uint8_t payload_type) {
   return false;
 }
 
-class VerifyingAudioReceiver : public NullRtpData {
+class VerifyingAudioReceiver : public RtpData {
  public:
   int32_t OnReceivedPayloadData(
       const uint8_t* payloadData,