Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Introduce proxy object for RtcEventLog and handle other comments. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index a0d614590984544156e6e4b90de8b7435290176e..e3aacdc2c4a5372a09b57f7a8a6b045627243003 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -20,6 +20,7 @@
#include "webrtc/base/buffer.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/call/mock/mock_rtc_event_log.h"
+#include "webrtc/call/rtc_event_log_proxy.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
@@ -131,12 +132,12 @@ class RtpSenderTest : public ::testing::Test {
RtpSenderTest()
: fake_clock_(kStartTime),
mock_rtc_event_log_(),
+ event_log_proxy(&mock_rtc_event_log_),
mock_paced_sender_(),
rtp_sender_(),
payload_(kPayload),
transport_(),
- kMarkerBit(true) {
- }
+ kMarkerBit(true) {}
void SetUp() override { SetUpRtpSender(true); }
@@ -144,12 +145,13 @@ class RtpSenderTest : public ::testing::Test {
rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
pacer ? &mock_paced_sender_ : nullptr,
&seq_num_allocator_, nullptr, nullptr,
- nullptr, nullptr, &mock_rtc_event_log_));
+ nullptr, nullptr, &event_log_proxy));
rtp_sender_->SetSequenceNumber(kSeqNum);
}
SimulatedClock fake_clock_;
MockRtcEventLog mock_rtc_event_log_;
+ RtcEventLogProxy event_log_proxy;
MockRtpPacketSender mock_paced_sender_;
MockTransportSequenceNumberAllocator seq_num_allocator_;
rtc::scoped_ptr<RTPSender> rtp_sender_;
@@ -953,9 +955,9 @@ TEST_F(RtpSenderTest, SendPadding) {
TEST_F(RtpSenderTest, SendRedundantPayloads) {
MockTransport transport;
- rtp_sender_.reset(new RTPSender(
- false, &fake_clock_, &transport, nullptr, &mock_paced_sender_, nullptr,
- nullptr, nullptr, nullptr, nullptr, &mock_rtc_event_log_));
+ rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport, nullptr,
+ &mock_paced_sender_, nullptr, nullptr,
+ nullptr, nullptr, nullptr, &event_log_proxy));
rtp_sender_->SetSequenceNumber(kSeqNum);
rtp_sender_->SetRtxPayloadType(kRtxPayload, kPayload);

Powered by Google App Engine
This is Rietveld 408576698