commit 8a1d2a315fb44a936cdf6eee646b7067e66ee8ea
author danilchap <danilchap@webrtc.org> Tue Aug 01 10:21:37 2017
committer Commit Bot <commit-bot@chromium.org> Tue Aug 01 10:21:37 2017
tree aef347dd3e675f99d837d9475f383051301d1a10
parent d339dbc7d4758e62b02740feda85c82dd6b2eba5

Remove NullReceiveStatistics
rtcp_sender accepts nullptr as indication statistics shouldn't be used,
Other uses of NullReceiveStatistcs were already deleted.

BUG=webrtc:8016

Review-Url: https://codereview.webrtc.org/2988143002
Cr-Commit-Position: refs/heads/master@{#19197}

webrtc/modules/rtp_rtcp/include/receive_statistics.h

diff --git a/webrtc/modules/rtp_rtcp/include/receive_statistics.h b/webrtc/modules/rtp_rtcp/include/receive_statistics.h
index edbaf8f..d10e933 100644
--- a/webrtc/modules/rtp_rtcp/include/receive_statistics.h
+++ b/webrtc/modules/rtp_rtcp/include/receive_statistics.h
@@ -95,21 +95,5 @@
   std::vector<rtcp::ReportBlock> RtcpReportBlocks(size_t max_blocks) override;
 };
 
-class NullReceiveStatistics : public ReceiveStatistics {
- public:
-  void IncomingPacket(const RTPHeader& rtp_header,
-                      size_t packet_length,
-                      bool retransmitted) override;
-  void FecPacketReceived(const RTPHeader& header,
-                         size_t packet_length) override;
-  StatisticianMap GetActiveStatisticians() const override;
-  StreamStatistician* GetStatistician(uint32_t ssrc) const override;
-  void SetMaxReorderingThreshold(int max_reordering_threshold) override;
-  void RegisterRtcpStatisticsCallback(
-      RtcpStatisticsCallback* callback) override;
-  void RegisterRtpStatisticsCallback(
-      StreamDataCountersCallback* callback) override;
-};
-
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RECEIVE_STATISTICS_H_

webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc

diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
index 21f5b37..150c88b 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
@@ -525,29 +525,4 @@
   return result;
 }
 
-void NullReceiveStatistics::IncomingPacket(const RTPHeader& rtp_header,
-                                           size_t packet_length,
-                                           bool retransmitted) {}
-
-void NullReceiveStatistics::FecPacketReceived(const RTPHeader& header,
-                                              size_t packet_length) {}
-
-StatisticianMap NullReceiveStatistics::GetActiveStatisticians() const {
-  return StatisticianMap();
-}
-
-StreamStatistician* NullReceiveStatistics::GetStatistician(
-    uint32_t ssrc) const {
-  return NULL;
-}
-
-void NullReceiveStatistics::SetMaxReorderingThreshold(
-    int max_reordering_threshold) {}
-
-void NullReceiveStatistics::RegisterRtcpStatisticsCallback(
-    RtcpStatisticsCallback* callback) {}
-
-void NullReceiveStatistics::RegisterRtpStatisticsCallback(
-    StreamDataCountersCallback* callback) {}
-
 }  // namespace webrtc

webrtc/video/video_send_stream_tests.cc

diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 890413f..94b57e3 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -757,8 +757,7 @@
       if (++send_count_ == 3) {
         uint16_t nack_sequence_number = header.sequenceNumber - 1;
         nacked_sequence_number_ = nack_sequence_number;
-        NullReceiveStatistics null_stats;
-        RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(), &null_stats,
+        RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(), nullptr,
                                nullptr, nullptr, transport_adapter_.get());
 
         rtcp_sender.SetRTCPStatus(RtcpMode::kReducedSize);