Prefer std::make_tuple over testing::make_tuple since the latter is a legacy alias Bug: None Change-Id: I0f75ae8636f13307edeb53233721762e2cfe1809 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/498540 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Henrik Boström <hbos@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48479}
diff --git a/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc index 2b3a104..3a96001 100644 --- a/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -38,14 +38,14 @@ } // namespace -class PushSincResamplerTest : public ::testing::TestWithParam< - ::testing::tuple<int, int, double, double>> { +class PushSincResamplerTest + : public ::testing::TestWithParam<std::tuple<int, int, double, double>> { public: PushSincResamplerTest() - : input_rate_(::testing::get<0>(GetParam())), - output_rate_(::testing::get<1>(GetParam())), - rms_error_(::testing::get<2>(GetParam())), - low_freq_error_(::testing::get<3>(GetParam())) {} + : input_rate_(std::get<0>(GetParam())), + output_rate_(std::get<1>(GetParam())), + rms_error_(std::get<2>(GetParam())), + low_freq_error_(std::get<3>(GetParam())) {} ~PushSincResamplerTest() override {} @@ -288,48 +288,48 @@ std::make_tuple(192000, 22000, -20.50, -9.20), // To 44.1kHz - ::testing::make_tuple(8000, 44100, kResamplingRMSError, -62.73), - ::testing::make_tuple(11000, 44100, kResamplingRMSError, -63.57), - ::testing::make_tuple(16000, 44100, kResamplingRMSError, -62.54), - ::testing::make_tuple(22000, 44100, kResamplingRMSError, -62.73), - ::testing::make_tuple(32000, 44100, kResamplingRMSError, -63.32), - ::testing::make_tuple(44100, 44100, kResamplingRMSError, -73.53), - ::testing::make_tuple(48000, 44100, -15.01, -64.04), - ::testing::make_tuple(96000, 44100, -18.49, -25.51), - ::testing::make_tuple(192000, 44100, -20.50, -13.31), + std::make_tuple(8000, 44100, kResamplingRMSError, -62.73), + std::make_tuple(11000, 44100, kResamplingRMSError, -63.57), + std::make_tuple(16000, 44100, kResamplingRMSError, -62.54), + std::make_tuple(22000, 44100, kResamplingRMSError, -62.73), + std::make_tuple(32000, 44100, kResamplingRMSError, -63.32), + std::make_tuple(44100, 44100, kResamplingRMSError, -73.53), + std::make_tuple(48000, 44100, -15.01, -64.04), + std::make_tuple(96000, 44100, -18.49, -25.51), + std::make_tuple(192000, 44100, -20.50, -13.31), // To 48kHz - ::testing::make_tuple(8000, 48000, kResamplingRMSError, -63.43), - ::testing::make_tuple(11000, 48000, kResamplingRMSError, -63.96), - ::testing::make_tuple(16000, 48000, kResamplingRMSError, -63.96), - ::testing::make_tuple(22000, 48000, kResamplingRMSError, -63.80), - ::testing::make_tuple(32000, 48000, kResamplingRMSError, -64.04), - ::testing::make_tuple(44100, 48000, kResamplingRMSError, -62.63), - ::testing::make_tuple(48000, 48000, kResamplingRMSError, -73.52), - ::testing::make_tuple(96000, 48000, -18.40, -28.44), - ::testing::make_tuple(192000, 48000, -20.43, -14.11), + std::make_tuple(8000, 48000, kResamplingRMSError, -63.43), + std::make_tuple(11000, 48000, kResamplingRMSError, -63.96), + std::make_tuple(16000, 48000, kResamplingRMSError, -63.96), + std::make_tuple(22000, 48000, kResamplingRMSError, -63.80), + std::make_tuple(32000, 48000, kResamplingRMSError, -64.04), + std::make_tuple(44100, 48000, kResamplingRMSError, -62.63), + std::make_tuple(48000, 48000, kResamplingRMSError, -73.52), + std::make_tuple(96000, 48000, -18.40, -28.44), + std::make_tuple(192000, 48000, -20.43, -14.11), // To 96kHz - ::testing::make_tuple(8000, 96000, kResamplingRMSError, -63.19), - ::testing::make_tuple(11000, 96000, kResamplingRMSError, -63.89), - ::testing::make_tuple(16000, 96000, kResamplingRMSError, -63.39), - ::testing::make_tuple(22000, 96000, kResamplingRMSError, -63.39), - ::testing::make_tuple(32000, 96000, kResamplingRMSError, -63.95), - ::testing::make_tuple(44100, 96000, kResamplingRMSError, -62.63), - ::testing::make_tuple(48000, 96000, kResamplingRMSError, -73.52), - ::testing::make_tuple(96000, 96000, kResamplingRMSError, -73.52), - ::testing::make_tuple(192000, 96000, kResamplingRMSError, -28.41), + std::make_tuple(8000, 96000, kResamplingRMSError, -63.19), + std::make_tuple(11000, 96000, kResamplingRMSError, -63.89), + std::make_tuple(16000, 96000, kResamplingRMSError, -63.39), + std::make_tuple(22000, 96000, kResamplingRMSError, -63.39), + std::make_tuple(32000, 96000, kResamplingRMSError, -63.95), + std::make_tuple(44100, 96000, kResamplingRMSError, -62.63), + std::make_tuple(48000, 96000, kResamplingRMSError, -73.52), + std::make_tuple(96000, 96000, kResamplingRMSError, -73.52), + std::make_tuple(192000, 96000, kResamplingRMSError, -28.41), // To 192kHz - ::testing::make_tuple(8000, 192000, kResamplingRMSError, -63.10), - ::testing::make_tuple(11000, 192000, kResamplingRMSError, -63.17), - ::testing::make_tuple(16000, 192000, kResamplingRMSError, -63.14), - ::testing::make_tuple(22000, 192000, kResamplingRMSError, -63.14), - ::testing::make_tuple(32000, 192000, kResamplingRMSError, -63.38), - ::testing::make_tuple(44100, 192000, kResamplingRMSError, -62.63), - ::testing::make_tuple(48000, 192000, kResamplingRMSError, -73.44), - ::testing::make_tuple(96000, 192000, kResamplingRMSError, -73.52), - ::testing::make_tuple(192000, 192000, kResamplingRMSError, -73.52), + std::make_tuple(8000, 192000, kResamplingRMSError, -63.10), + std::make_tuple(11000, 192000, kResamplingRMSError, -63.17), + std::make_tuple(16000, 192000, kResamplingRMSError, -63.14), + std::make_tuple(22000, 192000, kResamplingRMSError, -63.14), + std::make_tuple(32000, 192000, kResamplingRMSError, -63.38), + std::make_tuple(44100, 192000, kResamplingRMSError, -62.63), + std::make_tuple(48000, 192000, kResamplingRMSError, -73.44), + std::make_tuple(96000, 192000, kResamplingRMSError, -73.52), + std::make_tuple(192000, 192000, kResamplingRMSError, -73.52), // Next run through some additional cases interesting for WebRTC. // We skip some extreme downsampled cases (192 -> {8, 16}, 96 -> 8) @@ -338,31 +338,31 @@ // practice anyway. // To 8 kHz - ::testing::make_tuple(8000, 8000, kResamplingRMSError, -75.50), - ::testing::make_tuple(16000, 8000, -18.56, -28.79), - ::testing::make_tuple(32000, 8000, -20.36, -14.13), - ::testing::make_tuple(44100, 8000, -21.00, -11.39), - ::testing::make_tuple(48000, 8000, -20.96, -11.04), + std::make_tuple(8000, 8000, kResamplingRMSError, -75.50), + std::make_tuple(16000, 8000, -18.56, -28.79), + std::make_tuple(32000, 8000, -20.36, -14.13), + std::make_tuple(44100, 8000, -21.00, -11.39), + std::make_tuple(48000, 8000, -20.96, -11.04), // To 16 kHz - ::testing::make_tuple(8000, 16000, kResamplingRMSError, -70.30), - ::testing::make_tuple(11000, 16000, kResamplingRMSError, -72.31), - ::testing::make_tuple(16000, 16000, kResamplingRMSError, -75.51), - ::testing::make_tuple(22000, 16000, kResamplingRMSError, -52.08), - ::testing::make_tuple(32000, 16000, -18.48, -28.59), - ::testing::make_tuple(44100, 16000, -19.30, -19.67), - ::testing::make_tuple(48000, 16000, -19.81, -18.11), - ::testing::make_tuple(96000, 16000, -20.95, -10.9596), + std::make_tuple(8000, 16000, kResamplingRMSError, -70.30), + std::make_tuple(11000, 16000, kResamplingRMSError, -72.31), + std::make_tuple(16000, 16000, kResamplingRMSError, -75.51), + std::make_tuple(22000, 16000, kResamplingRMSError, -52.08), + std::make_tuple(32000, 16000, -18.48, -28.59), + std::make_tuple(44100, 16000, -19.30, -19.67), + std::make_tuple(48000, 16000, -19.81, -18.11), + std::make_tuple(96000, 16000, -20.95, -10.9596), // To 32 kHz - ::testing::make_tuple(8000, 32000, kResamplingRMSError, -70.30), - ::testing::make_tuple(11000, 32000, kResamplingRMSError, -71.34), - ::testing::make_tuple(16000, 32000, kResamplingRMSError, -75.51), - ::testing::make_tuple(22000, 32000, kResamplingRMSError, -72.05), - ::testing::make_tuple(32000, 32000, kResamplingRMSError, -75.51), - ::testing::make_tuple(44100, 32000, -16.44, -51.0349), - ::testing::make_tuple(48000, 32000, -16.90, -43.9967), - ::testing::make_tuple(96000, 32000, -19.61, -18.04), - ::testing::make_tuple(192000, 32000, -21.02, -10.94))); + std::make_tuple(8000, 32000, kResamplingRMSError, -70.30), + std::make_tuple(11000, 32000, kResamplingRMSError, -71.34), + std::make_tuple(16000, 32000, kResamplingRMSError, -75.51), + std::make_tuple(22000, 32000, kResamplingRMSError, -72.05), + std::make_tuple(32000, 32000, kResamplingRMSError, -75.51), + std::make_tuple(44100, 32000, -16.44, -51.0349), + std::make_tuple(48000, 32000, -16.90, -43.9967), + std::make_tuple(96000, 32000, -19.61, -18.04), + std::make_tuple(192000, 32000, -21.02, -10.94))); } // namespace webrtc
diff --git a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc index 862cbdc..33e0cd1 100644 --- a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
@@ -13,6 +13,7 @@ #include <cstdint> #include <cstring> #include <memory> +#include <tuple> #include <utility> #include "api/scoped_refptr.h" @@ -30,7 +31,6 @@ using Packet = ForwardErrorCorrection::Packet; using ReceivedFecPacket = ForwardErrorCorrection::ReceivedFecPacket; using ::testing::ElementsAreArray; -using ::testing::make_tuple; using ::testing::SizeIs; // General. Assume single-stream protection. @@ -119,8 +119,8 @@ read_packet.protection_length); // Ensure that the K-bits are removed and the packet mask has been packed. EXPECT_THAT( - make_tuple(read_packet.pkt->data.cdata() + packet_mask_offset, - read_packet.protected_streams[0].packet_mask_size), + std::make_tuple(read_packet.pkt->data.cdata() + packet_mask_offset, + read_packet.protected_streams[0].packet_mask_size), ElementsAreArray(expected_packet_mask, expected_packet_mask_size)); } @@ -135,7 +135,8 @@ EXPECT_EQ(kMediaStartSeqNum, ByteReader<uint16_t>::ReadBigEndian(packet + 16)); EXPECT_THAT( - make_tuple(packet + kFlexfecPacketMaskOffset, expected_packet_mask_size), + std::make_tuple(packet + kFlexfecPacketMaskOffset, + expected_packet_mask_size), ElementsAreArray(expected_packet_mask, expected_packet_mask_size)); } @@ -157,13 +158,14 @@ read_packet.protection_length); // Verify that the call to ReadFecHeader did normalize the packet masks. EXPECT_THAT( - make_tuple(read_packet.pkt->data.cdata() + kFlexfecPacketMaskOffset, - read_packet.protected_streams[0].packet_mask_size), + std::make_tuple(read_packet.pkt->data.cdata() + kFlexfecPacketMaskOffset, + read_packet.protected_streams[0].packet_mask_size), ElementsAreArray(expected_packet_mask, expected_packet_mask_size)); // Verify that the call to ReadFecHeader did not tamper with the payload. EXPECT_THAT( - make_tuple(read_packet.pkt->data.cdata() + read_packet.fec_header_size, - read_packet.pkt->data.size() - read_packet.fec_header_size), + std::make_tuple( + read_packet.pkt->data.cdata() + read_packet.fec_header_size, + read_packet.pkt->data.size() - read_packet.fec_header_size), ElementsAreArray(written_packet.data.cdata() + expected_fec_header_size, written_packet.data.size() - expected_fec_header_size)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc index 384f1c0..d35c883 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
@@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/app.h" #include <cstdint> +#include <tuple> #include "rtc_base/buffer.h" #include "test/gmock.h" @@ -22,7 +23,6 @@ using rtcp::App; using ::testing::ElementsAreArray; -using ::testing::make_tuple; constexpr uint32_t kName = ((uint32_t)'n' << 24) | ((uint32_t)'a' << 16) | ((uint32_t)'m' << 8) | (uint32_t)'e'; @@ -62,7 +62,7 @@ Buffer raw = app.Build(); - EXPECT_THAT(make_tuple(raw.data(), raw.size()), + EXPECT_THAT(std::make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacketWithoutData)); } @@ -85,7 +85,7 @@ Buffer raw = app.Build(); - EXPECT_THAT(make_tuple(raw.data(), raw.size()), + EXPECT_THAT(std::make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacketWithData)); } @@ -96,7 +96,7 @@ EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc()); EXPECT_EQ(kSubtype, parsed.sub_type()); EXPECT_EQ(kName, parsed.name()); - EXPECT_THAT(make_tuple(parsed.data(), parsed.data_size()), + EXPECT_THAT(std::make_tuple(parsed.data(), parsed.data_size()), ElementsAreArray(kData)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc index 0161e40..272bd87 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
@@ -12,6 +12,7 @@ #include <cstddef> #include <cstdint> +#include <tuple> #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "modules/rtp_rtcp/source/rtcp_packet/rrtr.h" @@ -24,7 +25,6 @@ using ::testing::ElementsAre; using ::testing::ElementsAreArray; -using ::testing::make_tuple; using ::testing::SizeIs; using webrtc::rtcp::ExtendedReports; using webrtc::rtcp::ReceiveTimeInfo; @@ -79,7 +79,7 @@ Buffer packet = xr.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kEmptyPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc index fe3e70f..8438609 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
@@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/fir.h" #include <cstdint> +#include <tuple> #include "rtc_base/buffer.h" #include "test/gmock.h" @@ -22,7 +23,6 @@ using ::testing::ElementsAreArray; using ::testing::Eq; using ::testing::Field; -using ::testing::make_tuple; using webrtc::rtcp::Fir; namespace webrtc { @@ -55,7 +55,7 @@ Buffer packet = fir.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc index 312f051..2e97fca 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc
@@ -12,6 +12,7 @@ #include <cstddef> #include <cstdint> +#include <tuple> #include "rtc_base/buffer.h" #include "rtc_base/checks.h" @@ -23,7 +24,6 @@ using rtcp::LossNotification; using ::testing::ElementsAreArray; -using ::testing::make_tuple; TEST(RtcpPacketLossNotificationTest, SetWithIllegalValuesFails) { constexpr uint16_t kLastDecoded = 0x3c7b; @@ -65,7 +65,7 @@ Buffer packet = loss_notification.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc index 3530bbc..4e14827 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
@@ -14,6 +14,7 @@ #include <cstdint> #include <iterator> #include <span> +#include <tuple> #include "rtc_base/buffer.h" #include "test/gmock.h" @@ -27,7 +28,6 @@ using ::testing::_; using ::testing::ElementsAre; using ::testing::ElementsAreArray; -using ::testing::make_tuple; using ::testing::MockFunction; using ::testing::UnorderedElementsAreArray; @@ -69,7 +69,7 @@ Buffer packet = nack.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); } @@ -91,7 +91,7 @@ Buffer packet = nack.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kWrapPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc index fe737a9..3aeb68e 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
@@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/pli.h" #include <cstdint> +#include <tuple> #include "rtc_base/buffer.h" #include "test/gmock.h" @@ -18,7 +19,6 @@ #include "test/rtcp_packet_parser.h" using ::testing::ElementsAreArray; -using ::testing::make_tuple; using webrtc::rtcp::Pli; namespace webrtc { @@ -46,7 +46,7 @@ Buffer packet = pli.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc index 45b75e6..eeaa07d 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
@@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" #include <cstdint> +#include <tuple> #include "rtc_base/buffer.h" #include "test/gmock.h" @@ -18,7 +19,6 @@ #include "test/rtcp_packet_parser.h" using ::testing::ElementsAreArray; -using ::testing::make_tuple; using webrtc::rtcp::RapidResyncRequest; namespace webrtc { @@ -46,7 +46,7 @@ Buffer packet = rrr.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc index 916dfcd..fca7726 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
@@ -12,6 +12,7 @@ #include <cstddef> #include <cstdint> +#include <tuple> #include <utility> #include <vector> @@ -23,7 +24,6 @@ using ::testing::ElementsAreArray; using ::testing::IsEmpty; -using ::testing::make_tuple; using webrtc::rtcp::ReceiverReport; using webrtc::rtcp::ReportBlock; @@ -85,7 +85,8 @@ Buffer raw = rr.Build(); - EXPECT_THAT(make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacket)); + EXPECT_THAT(std::make_tuple(raw.data(), raw.size()), + ElementsAreArray(kPacket)); } TEST(RtcpPacketReceiverReportTest, CreateAndParseWithoutReportBlocks) {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc index bc3fa0c..5bd288f 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
@@ -14,6 +14,7 @@ #include <cstdint> #include <cstring> #include <iterator> +#include <tuple> #include <vector> #include "rtc_base/buffer.h" @@ -23,7 +24,6 @@ using ::testing::ElementsAreArray; using ::testing::IsEmpty; -using ::testing::make_tuple; using webrtc::rtcp::Remb; namespace webrtc { @@ -48,7 +48,7 @@ Buffer packet = remb.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc index 9ffe6c7..db040f0 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
@@ -12,6 +12,7 @@ #include <cstddef> #include <cstdint> +#include <tuple> #include <utility> #include <vector> @@ -23,7 +24,6 @@ #include "test/rtcp_packet_parser.h" using ::testing::ElementsAreArray; -using ::testing::make_tuple; using webrtc::rtcp::ReportBlock; using webrtc::rtcp::SenderReport; @@ -50,7 +50,8 @@ sr.SetOctetCount(kOctetCount); Buffer raw = sr.Build(); - EXPECT_THAT(make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacket)); + EXPECT_THAT(std::make_tuple(raw.data(), raw.size()), + ElementsAreArray(kPacket)); } TEST(RtcpPacketSenderReportTest, ParseWithoutReportBlocks) {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc index 00ea2d6..0343d42 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
@@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" #include <cstdint> +#include <tuple> #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" #include "rtc_base/buffer.h" @@ -20,7 +21,6 @@ using ::testing::ElementsAreArray; using ::testing::IsEmpty; -using ::testing::make_tuple; using webrtc::rtcp::TmmbItem; using webrtc::rtcp::Tmmbn; @@ -42,7 +42,7 @@ Buffer packet = tmmbn.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc index ecdd959..cdd2624 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
@@ -11,6 +11,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" #include <cstdint> +#include <tuple> #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" #include "rtc_base/buffer.h" @@ -19,7 +20,6 @@ #include "test/rtcp_packet_parser.h" using ::testing::ElementsAreArray; -using ::testing::make_tuple; using webrtc::rtcp::TmmbItem; using webrtc::rtcp::Tmmbr; @@ -41,7 +41,7 @@ Buffer packet = tmmbr.Build(); - EXPECT_THAT(make_tuple(packet.data(), packet.size()), + EXPECT_THAT(std::make_tuple(packet.data(), packet.size()), ElementsAreArray(kPacket)); }
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index 96b5240..dfab3c0 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc
@@ -821,10 +821,9 @@ } else { EXPECT_EQ(test::VideoTestConstants::kFakeVideoSendPayloadType, rtp_packet.PayloadType()); - EXPECT_THAT( - ::testing::make_tuple(test::VideoTestConstants::kVideoSendSsrcs, - num_video_streams_), - ::testing::Contains(rtp_packet.Ssrc())); + EXPECT_THAT(std::make_tuple(test::VideoTestConstants::kVideoSendSsrcs, + num_video_streams_), + ::testing::Contains(rtp_packet.Ssrc())); sent_media_ = true; } @@ -3282,8 +3281,8 @@ public ::testing::WithParamInterface<ParameterizationType> { public: Vp9Test() - : params_(::testing::get<Vp9TestParams>(GetParam())), - use_scalability_mode_identifier_(::testing::get<bool>(GetParam())) {} + : params_(std::get<Vp9TestParams>(GetParam())), + use_scalability_mode_identifier_(std::get<bool>(GetParam())) {} protected: const Vp9TestParams params_;