diff --git a/audio/audio_send_stream_tests.cc b/audio/audio_send_stream_tests.cc index e042685e66..36881c79c3 100644 --- a/audio/audio_send_stream_tests.cc +++ b/audio/audio_send_stream_tests.cc @@ -84,8 +84,8 @@ TEST_F(AudioSendStreamCallTest, NoExtensionsByDefault) { private: Action OnSendRtp(rtc::ArrayView packet) override { RtpPacket rtp_packet; - EXPECT_TRUE(rtp_packet.Parse(packet)); // rtp packet is valid. - EXPECT_EQ(packet[0] & 0b0001'0000, 0); // extension bit not set. + EXPECT_TRUE(rtp_packet.Parse(packet)); // rtp packet is valid. + EXPECT_EQ(packet[0] & 0b0001'0000, 0); // extension bit not set. observation_complete_.Set(); return SEND_PACKET; diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index e89dffa497..9e3b606543 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -561,22 +561,21 @@ TEST(AudioSendStreamTest, AudioNetworkAdaptorReceivesOverhead) { const std::string kAnaConfigString = "abcde"; EXPECT_CALL(helper.mock_encoder_factory(), Create) - .WillOnce( - WithArg<1>([&kAnaConfigString](const SdpAudioFormat& format) { - auto mock_encoder = SetupAudioEncoderMock(format); - InSequence s; - EXPECT_CALL( - *mock_encoder, - OnReceivedOverhead(Eq(kOverheadPerPacket.bytes()))); - EXPECT_CALL(*mock_encoder, - EnableAudioNetworkAdaptor(StrEq(kAnaConfigString), _)) - .WillOnce(Return(true)); - // Note: Overhead is received AFTER ANA has been enabled. - EXPECT_CALL( - *mock_encoder, - OnReceivedOverhead(Eq(kOverheadPerPacket.bytes()))); - return mock_encoder; - })); + .WillOnce(WithArg<1>([&kAnaConfigString](const SdpAudioFormat& format) { + auto mock_encoder = SetupAudioEncoderMock(format); + InSequence s; + EXPECT_CALL( + *mock_encoder, + OnReceivedOverhead(Eq(kOverheadPerPacket.bytes()))); + EXPECT_CALL(*mock_encoder, + EnableAudioNetworkAdaptor(StrEq(kAnaConfigString), _)) + .WillOnce(Return(true)); + // Note: Overhead is received AFTER ANA has been enabled. + EXPECT_CALL( + *mock_encoder, + OnReceivedOverhead(Eq(kOverheadPerPacket.bytes()))); + return mock_encoder; + })); EXPECT_CALL(*helper.rtp_rtcp(), ExpectedPerPacketOverhead) .WillRepeatedly(Return(kOverheadPerPacket.bytes())); EXPECT_CALL(*helper.channel_send(), RegisterPacketOverhead); diff --git a/audio/voip/test/audio_channel_unittest.cc b/audio/voip/test/audio_channel_unittest.cc index 90407a7155..d4597b969e 100644 --- a/audio/voip/test/audio_channel_unittest.cc +++ b/audio/voip/test/audio_channel_unittest.cc @@ -58,7 +58,7 @@ class AudioChannelTest : public ::testing::Test { // By default, run the queued task immediately. ON_CALL(task_queue_, PostTaskImpl) .WillByDefault(WithArg<0>( - [](absl::AnyInvocable task) { std::move(task)(); })); + [](absl::AnyInvocable task) { std::move(task)(); })); } void SetUp() override { audio_channel_ = CreateAudioChannel(kLocalSsrc); }