Enable and fix chromium clang warnings in rtp_rtcp test targets

Bug: webrtc:163 Change-Id: I4ed3e63296d8bf06536a83196d597c7a906ba11c Reviewed-on: https://webrtc-review.googlesource.com/60802 Reviewed-by: Björn Terelius <[email protected]> Reviewed-by: Patrik Höglund <[email protected]> Commit-Queue: Danil Chapovalov <[email protected]> Cr-Commit-Position: refs/heads/master@{#22357}
cneyoo · Mar 9, 2018 · 9486b11 · 9486b11
1 parent 7bb37b8
commit 9486b11
Show file tree

Hide file tree

Showing 32 changed files with 184 additions and 52 deletions.
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
@@ -421,6 +421,7 @@ if (rtc_include_tests) {
   rtc_source_set("mocks") {
     testonly = true
     sources = [
+      "rtc_event_log/mock/mock_rtc_event_log.cc",
       "rtc_event_log/mock/mock_rtc_event_log.h",
     ]
     deps = [

diff --git a/logging/rtc_event_log/mock/mock_rtc_event_log.cc b/logging/rtc_event_log/mock/mock_rtc_event_log.cc
@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
+
+namespace webrtc {
+
+MockRtcEventLog::MockRtcEventLog() = default;
+MockRtcEventLog::~MockRtcEventLog() = default;
+
+}  // namespace webrtc
+
diff --git a/logging/rtc_event_log/mock/mock_rtc_event_log.h b/logging/rtc_event_log/mock/mock_rtc_event_log.h
@@ -20,6 +20,9 @@ namespace webrtc {
 
 class MockRtcEventLog : public RtcEventLog {
  public:
+  MockRtcEventLog();
+  ~MockRtcEventLog();
+
   virtual bool StartLogging(std::unique_ptr<RtcEventLogOutput> output,
                             int64_t output_period_ms) {
     return StartLoggingProxy(output.get(), output_period_ms);

diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
@@ -264,15 +264,17 @@ rtc_source_set("fec_test_helper") {
 
   # TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-  if (!build_with_chromium && is_clang) {
-    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-    suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-  }
 }
 
 rtc_source_set("mock_rtp_rtcp") {
   testonly = true
   sources = [
+    "mocks/mock_recovered_packet_receiver.cc",
+    "mocks/mock_rtcp_bandwidth_observer.cc",
+    "mocks/mock_rtcp_rtt_stats.cc",
+    "mocks/mock_rtp_rtcp.cc",
+  ]
+  public = [
     "mocks/mock_recovered_packet_receiver.h",
     "mocks/mock_rtcp_bandwidth_observer.h",
     "mocks/mock_rtcp_rtt_stats.h",
@@ -317,10 +319,6 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
     ]
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
   }
 
   rtc_source_set("rtp_rtcp_unittests") {
@@ -422,9 +420,5 @@ if (rtc_include_tests) {
 
     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
   }
 }
diff --git a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.cc b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.cc
@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
+
+namespace webrtc {
+
+MockRecoveredPacketReceiver::MockRecoveredPacketReceiver() = default;
+MockRecoveredPacketReceiver::~MockRecoveredPacketReceiver() = default;
+
+}  // namespace webrtc
diff --git a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
@@ -19,6 +19,8 @@ namespace webrtc {
 
 class MockRecoveredPacketReceiver : public RecoveredPacketReceiver {
  public:
+  MockRecoveredPacketReceiver();
+  ~MockRecoveredPacketReceiver();
   MOCK_METHOD2(OnRecoveredPacket, void(const uint8_t* packet, size_t length));
 };
 

diff --git a/modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.cc b/modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.cc
@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h"
+
+namespace webrtc {
+
+MockRtcpBandwidthObserver::MockRtcpBandwidthObserver() = default;
+MockRtcpBandwidthObserver::~MockRtcpBandwidthObserver() = default;
+
+}  // namespace webrtc
diff --git a/modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h b/modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h
@@ -18,6 +18,9 @@ namespace webrtc {
 
 class MockRtcpBandwidthObserver : public RtcpBandwidthObserver {
  public:
+  MockRtcpBandwidthObserver();
+  ~MockRtcpBandwidthObserver();
+
   MOCK_METHOD1(OnReceivedEstimatedBitrate, void(uint32_t));
   MOCK_METHOD3(OnReceivedRtcpReceiverReport,
                void(const ReportBlockList&, int64_t, int64_t));

diff --git a/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.cc b/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.cc
@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h"
+
+namespace webrtc {
+
+MockRtcpRttStats::MockRtcpRttStats() = default;
+MockRtcpRttStats::~MockRtcpRttStats() = default;
+
+}  // namespace webrtc
diff --git a/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h b/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h
@@ -18,6 +18,9 @@ namespace webrtc {
 
 class MockRtcpRttStats : public RtcpRttStats {
  public:
+  MockRtcpRttStats();
+  ~MockRtcpRttStats();
+
   MOCK_METHOD1(OnRttUpdate, void(int64_t rtt));
   MOCK_CONST_METHOD0(LastProcessedRtt, int64_t());
 };

diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.cc b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.cc
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
+
+namespace webrtc {
+
+MockRtpData::MockRtpData() = default;
+MockRtpData::~MockRtpData() = default;
+
+MockRtpRtcp::MockRtpRtcp() = default;
+MockRtpRtcp::~MockRtpRtcp() = default;
+
+}  // namespace webrtc
diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -27,6 +27,9 @@ namespace webrtc {
 
 class MockRtpData : public RtpData {
  public:
+  MockRtpData();
+  ~MockRtpData();
+
   MOCK_METHOD3(OnReceivedPayloadData,
                int32_t(const uint8_t* payload_data,
                        size_t payload_size,
@@ -35,6 +38,9 @@ class MockRtpData : public RtpData {
 
 class MockRtpRtcp : public RtpRtcp {
  public:
+  MockRtpRtcp();
+  ~MockRtpRtcp();
+
   MOCK_METHOD1(RegisterDefaultModule, int32_t(RtpRtcp* module));
   MOCK_METHOD0(DeRegisterDefaultModule, int32_t());
   MOCK_METHOD0(DefaultModuleRegistered, bool());

diff --git a/modules/rtp_rtcp/source/byte_io_unittest.cc b/modules/rtp_rtcp/source/byte_io_unittest.cc
@@ -18,8 +18,8 @@ namespace {
 
 class ByteIoTest : public ::testing::Test {
  protected:
-  ByteIoTest() {}
-  virtual ~ByteIoTest() {}
+  ByteIoTest() = default;
+  ~ByteIoTest() override = default;
 
   enum { kAlignments = sizeof(uint64_t) - 1 };
 

diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc
@@ -30,6 +30,17 @@ constexpr uint8_t kVp8PayloadType = 120;
 constexpr int kPacketTimestampIncrement = 3000;
 }  // namespace
 
+MediaPacketGenerator::MediaPacketGenerator(uint32_t min_packet_size,
+                                           uint32_t max_packet_size,
+                                           uint32_t ssrc,
+                                           Random* random)
+    : min_packet_size_(min_packet_size),
+      max_packet_size_(max_packet_size),
+      ssrc_(ssrc),
+      random_(random) {}
+
+MediaPacketGenerator::~MediaPacketGenerator() = default;
+
 ForwardErrorCorrection::PacketList MediaPacketGenerator::ConstructMediaPackets(
     int num_media_packets,
     uint16_t start_seq_num) {

diff --git a/modules/rtp_rtcp/source/fec_test_helper.h b/modules/rtp_rtcp/source/fec_test_helper.h
@@ -36,11 +36,8 @@ class MediaPacketGenerator {
   MediaPacketGenerator(uint32_t min_packet_size,
                        uint32_t max_packet_size,
                        uint32_t ssrc,
-                       Random* random)
-      : min_packet_size_(min_packet_size),
-        max_packet_size_(max_packet_size),
-        ssrc_(ssrc),
-        random_(random) {}
+                       Random* random);
+  ~MediaPacketGenerator();
 
   // Construct the media packets, up to |num_media_packets| packets.
   ForwardErrorCorrection::PacketList ConstructMediaPackets(

diff --git a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
@@ -211,7 +211,7 @@ TEST_F(FlexfecReceiverTest, ReceivesMultiplePackets) {
   }
 
   // Receive FEC packet.
-  auto fec_packet = fec_packets.front();
+  auto* fec_packet = fec_packets.front();
   std::unique_ptr<Packet> packet_with_rtp_header =
       packet_generator_.BuildFlexfecPacket(*fec_packet);
   std::unique_ptr<ForwardErrorCorrection::ReceivedPacket> received_packet =
@@ -354,7 +354,7 @@ TEST_F(FlexfecReceiverTest, RecoversFrom50PercentLoss) {
 
   // Receive all FEC packets.
   media_it = media_packets.begin();
-  for (const auto& fec_packet : fec_packets) {
+  for (const auto* fec_packet : fec_packets) {
     std::unique_ptr<Packet> fec_packet_with_rtp_header =
         packet_generator_.BuildFlexfecPacket(*fec_packet);
     ++media_it;
@@ -453,7 +453,7 @@ TEST_F(FlexfecReceiverTest, SurvivesOldRecoveredPacketBeingReinserted) {
     void SetReceiver(FlexfecReceiver* receiver) { receiver_ = receiver; }
 
     // Implements RecoveredPacketReceiver.
-    void OnRecoveredPacket(const uint8_t* packet, size_t length) {
+    void OnRecoveredPacket(const uint8_t* packet, size_t length) override {
       RtpPacketReceived parsed_packet;
       EXPECT_TRUE(parsed_packet.Parse(packet, length));
       parsed_packet.set_recovered(true);
@@ -567,7 +567,7 @@ TEST_F(FlexfecReceiverTest, RecoveryCallbackDoesNotLoopInfinitely) {
     bool DeepRecursion() const { return deep_recursion_; }
 
     // Implements RecoveredPacketReceiver.
-    void OnRecoveredPacket(const uint8_t* packet, size_t length) {
+    void OnRecoveredPacket(const uint8_t* packet, size_t length) override {
       RtpPacketReceived parsed_packet;
       EXPECT_TRUE(parsed_packet.Parse(packet, length));
 

diff --git a/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
@@ -126,7 +126,7 @@ class RtpRtcpRtxNackTest : public ::testing::Test {
         payload_data_length(sizeof(payload_data)),
         fake_clock(123456),
         retransmission_rate_limiter_(&fake_clock, kMaxRttMs) {}
-  ~RtpRtcpRtxNackTest() {}
+  ~RtpRtcpRtxNackTest() override {}
 
   void SetUp() override {
     RtpRtcp::Configuration configuration;

diff --git a/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
@@ -195,7 +195,7 @@ TEST_F(ReceiveStatisticsTest, RtcpCallbacks) {
    public:
     TestCallback()
         : RtcpStatisticsCallback(), num_calls_(0), ssrc_(0), stats_() {}
-    virtual ~TestCallback() {}
+    ~TestCallback() override {}
 
     void StatisticsUpdated(const RtcpStatistics& statistics,
                            uint32_t ssrc) override {
@@ -283,10 +283,10 @@ class RtpTestCallback : public StreamDataCountersCallback {
  public:
   RtpTestCallback()
       : StreamDataCountersCallback(), num_calls_(0), ssrc_(0), stats_() {}
-  virtual ~RtpTestCallback() {}
+  ~RtpTestCallback() override = default;
 
-  virtual void DataCountersUpdated(const StreamDataCounters& counters,
-                                   uint32_t ssrc) {
+  void DataCountersUpdated(const StreamDataCounters& counters,
+                           uint32_t ssrc) override {
     ssrc_ = ssrc;
     stats_ = counters;
     ++num_calls_;

diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
@@ -32,7 +32,7 @@ class RemoteNtpTimeEstimatorTest : public ::testing::Test {
       : local_clock_(kLocalClockInitialTimeMs * 1000),
         remote_clock_(kRemoteClockInitialTimeMs * 1000),
         estimator_(new RemoteNtpTimeEstimator(&local_clock_)) {}
-  ~RemoteNtpTimeEstimatorTest() {}
+  ~RemoteNtpTimeEstimatorTest() override = default;
 
   void AdvanceTimeMilliseconds(int64_t ms) {
     local_clock_.AdvanceTimeMilliseconds(ms);

diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -185,7 +185,7 @@ TEST(NACKStringBuilderTest, TestCase13) {
 class RtcpPacketTypeCounterObserverImpl : public RtcpPacketTypeCounterObserver {
  public:
   RtcpPacketTypeCounterObserverImpl() : ssrc_(0) {}
-  virtual ~RtcpPacketTypeCounterObserverImpl() {}
+  ~RtcpPacketTypeCounterObserverImpl() override = default;
   void RtcpPacketTypesCounterUpdated(
       uint32_t ssrc,
       const RtcpPacketTypeCounter& packet_counter) override {

diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
@@ -82,7 +82,7 @@ void VerifyExtensions(RTPTypeHeader* type,
 class RtpPacketizerVp8Test : public ::testing::Test {
  protected:
   RtpPacketizerVp8Test() : helper_(NULL) {}
-  virtual void TearDown() { delete helper_; }
+  void TearDown() override { delete helper_; }
   bool Init(const size_t* partition_sizes, size_t num_partitions) {
     hdr_info_.pictureId = kNoPictureId;
     hdr_info_.nonReference = false;

diff --git a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
@@ -127,9 +127,7 @@ class RtpPacketizerVp9Test : public ::testing::Test {
   static constexpr size_t kMaxPacketSize = 1200;
 
   RtpPacketizerVp9Test() : packet_(kNoExtensions, kMaxPacketSize) {}
-  virtual void SetUp() {
-    expected_.InitRTPVideoHeaderVP9();
-  }
+  void SetUp() override { expected_.InitRTPVideoHeaderVP9(); }
 
   RtpPacketToSend packet_;
   std::unique_ptr<uint8_t[]> payload_;
@@ -584,9 +582,7 @@ class RtpDepacketizerVp9Test : public ::testing::Test {
   RtpDepacketizerVp9Test()
       : depacketizer_(new RtpDepacketizerVp9()) {}
 
-  virtual void SetUp() {
-    expected_.InitRTPVideoHeaderVP9();
-  }
+  void SetUp() override { expected_.InitRTPVideoHeaderVP9(); }
 
   RTPVideoHeaderVP9 expected_;
   std::unique_ptr<RtpDepacketizer> depacketizer_;

diff --git a/modules/rtp_rtcp/source/rtp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtp_receiver_unittest.cc
@@ -236,7 +236,7 @@ TEST_F(RtpReceiverTest, GetSourcesRemoveOutdatedSource) {
   header.arrOfCSRCs[0] = kCsrc1;
   EXPECT_TRUE(rtp_receiver_->IncomingRtpPacket(
       header, kTestPayload, sizeof(kTestPayload), payload_specific));
-  auto rtp_receiver_impl = static_cast<RtpReceiverImpl*>(rtp_receiver_.get());
+  auto* rtp_receiver_impl = static_cast<RtpReceiverImpl*>(rtp_receiver_.get());
   auto ssrc_sources = rtp_receiver_impl->ssrc_sources_for_testing();
   ASSERT_EQ(1u, ssrc_sources.size());
   EXPECT_EQ(kSsrc1, ssrc_sources.begin()->source_id());

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -42,7 +42,7 @@ const int64_t kMaxRttMs = 1000;
 class RtcpRttStatsTestImpl : public RtcpRttStats {
  public:
   RtcpRttStatsTestImpl() : rtt_ms_(0) {}
-  virtual ~RtcpRttStatsTestImpl() {}
+  ~RtcpRttStatsTestImpl() override = default;
 
   void OnRttUpdate(int64_t rtt_ms) override { rtt_ms_ = rtt_ms; }
   int64_t LastProcessedRtt() const override { return rtt_ms_; }