From 0bc8423fe5e3fa37c0e2cf21752d17f1fd2567d6 Mon Sep 17 00:00:00 2001
From: danilchap <danilchap@webrtc.org>
Date: Fri, 11 Aug 2017 08:12:54 -0700
Subject: [PATCH] Move RtcpReportBlocks implementation from ReceiveStatistics
 to ReceiveStatisticsImpl

BUG=webrtc:8016

Review-Url: https://codereview.webrtc.org/2997783002
Cr-Commit-Position: refs/heads/master@{#19327}
---
 webrtc/modules/rtp_rtcp/include/receive_statistics.h      | 4 ----
 webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc | 2 +-
 webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h  | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webrtc/modules/rtp_rtcp/include/receive_statistics.h b/webrtc/modules/rtp_rtcp/include/receive_statistics.h
index d10e933810..11e18be841 100644
--- a/webrtc/modules/rtp_rtcp/include/receive_statistics.h
+++ b/webrtc/modules/rtp_rtcp/include/receive_statistics.h
@@ -89,10 +89,6 @@ class ReceiveStatistics : public ReceiveStatisticsProvider {
   // Called on new RTP stats creation.
   virtual void RegisterRtpStatisticsCallback(
       StreamDataCountersCallback* callback) = 0;
-
-  // TODO(danilchap): Make pure virtual when all implmentations of the
-  // ReceiveStatistics interface will implement it.
-  std::vector<rtcp::ReportBlock> RtcpReportBlocks(size_t max_blocks) override;
 };
 
 }  // namespace webrtc
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
index 7ac86ee0f2..a3e1ef1254 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
@@ -494,7 +494,7 @@ void ReceiveStatisticsImpl::DataCountersUpdated(const StreamDataCounters& stats,
   }
 }
 
-std::vector<rtcp::ReportBlock> ReceiveStatistics::RtcpReportBlocks(
+std::vector<rtcp::ReportBlock> ReceiveStatisticsImpl::RtcpReportBlocks(
     size_t max_blocks) {
   StatisticianMap statisticians = GetActiveStatisticians();
   std::vector<rtcp::ReportBlock> result;
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
index c698862b93..1256562d7d 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <map>
+#include <vector>
 
 #include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/rtc_base/rate_statistics.h"
@@ -97,6 +98,9 @@ class ReceiveStatisticsImpl : public ReceiveStatistics,
 
   ~ReceiveStatisticsImpl();
 
+  // Implement ReceiveStatisticsProvider.
+  std::vector<rtcp::ReportBlock> RtcpReportBlocks(size_t max_blocks) override;
+
   // Implement ReceiveStatistics.
   void IncomingPacket(const RTPHeader& header,
                       size_t packet_length,