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

Unified Diff: pc/rtcstatscollector_unittest.cc

Issue 3007973002: Mark template class RefCountedObject as final.
Patch Set: Rebased. Created 3 years, 3 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: pc/rtcstatscollector_unittest.cc
diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
index cb5a79f77aa6d5675687747cc5a93d33ea673750..cc9e2cb5251f9cbd69af4c79a5ba8a0f7390ab68 100644
--- a/pc/rtcstatscollector_unittest.cc
+++ b/pc/rtcstatscollector_unittest.cc
@@ -285,16 +285,16 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
worker_thread_,
network_thread_)),
session_(channel_manager_.get(), cricket::MediaConfig()),
- pc_() {
+ pc_(new rtc::RefCountedObject<MockPeerConnection>()) {
// Default return values for mocks.
- EXPECT_CALL(pc_, local_streams()).WillRepeatedly(Return(nullptr));
- EXPECT_CALL(pc_, remote_streams()).WillRepeatedly(Return(nullptr));
- EXPECT_CALL(pc_, session()).WillRepeatedly(Return(&session_));
- EXPECT_CALL(pc_, GetSenders()).WillRepeatedly(Return(
+ EXPECT_CALL(*pc_, local_streams()).WillRepeatedly(Return(nullptr));
+ EXPECT_CALL(*pc_, remote_streams()).WillRepeatedly(Return(nullptr));
+ EXPECT_CALL(*pc_, session()).WillRepeatedly(Return(&session_));
+ EXPECT_CALL(*pc_, GetSenders()).WillRepeatedly(Return(
std::vector<rtc::scoped_refptr<RtpSenderInterface>>()));
- EXPECT_CALL(pc_, GetReceivers()).WillRepeatedly(Return(
+ EXPECT_CALL(*pc_, GetReceivers()).WillRepeatedly(Return(
std::vector<rtc::scoped_refptr<RtpReceiverInterface>>()));
- EXPECT_CALL(pc_, sctp_data_channels()).WillRepeatedly(
+ EXPECT_CALL(*pc_, sctp_data_channels()).WillRepeatedly(
ReturnRef(data_channels_));
EXPECT_CALL(session_, video_channel()).WillRepeatedly(ReturnNull());
EXPECT_CALL(session_, voice_channel()).WillRepeatedly(ReturnNull());
@@ -311,7 +311,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
rtc::Thread* signaling_thread() { return signaling_thread_; }
cricket::FakeMediaEngine* media_engine() { return media_engine_; }
MockWebRtcSession& session() { return session_; }
- MockPeerConnection& pc() { return pc_; }
+ MockPeerConnection& pc() { return *pc_; }
std::vector<rtc::scoped_refptr<DataChannel>>& data_channels() {
return data_channels_;
}
@@ -327,7 +327,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
uint32_t ssrc) {
rtc::scoped_refptr<StreamCollection> local_streams =
StreamCollection::Create();
- EXPECT_CALL(pc_, local_streams())
+ EXPECT_CALL(*pc_, local_streams())
.WillRepeatedly(Return(local_streams));
rtc::scoped_refptr<MediaStream> local_stream =
@@ -346,7 +346,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
}
rtc::scoped_refptr<MockRtpSender> sender = CreateMockSender(track, ssrc);
- EXPECT_CALL(pc_, GetSenders()).WillRepeatedly(Return(
+ EXPECT_CALL(*pc_, GetSenders()).WillRepeatedly(Return(
std::vector<rtc::scoped_refptr<RtpSenderInterface>>({
rtc::scoped_refptr<RtpSenderInterface>(sender.get()) })));
}
@@ -356,7 +356,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
uint32_t ssrc) {
rtc::scoped_refptr<StreamCollection> remote_streams =
StreamCollection::Create();
- EXPECT_CALL(pc_, remote_streams())
+ EXPECT_CALL(*pc_, remote_streams())
.WillRepeatedly(Return(remote_streams));
rtc::scoped_refptr<MediaStream> remote_stream =
@@ -376,7 +376,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
rtc::scoped_refptr<MockRtpReceiver> receiver =
CreateMockReceiver(track, ssrc);
- EXPECT_CALL(pc_, GetReceivers()).WillRepeatedly(Return(
+ EXPECT_CALL(*pc_, GetReceivers()).WillRepeatedly(Return(
std::vector<rtc::scoped_refptr<RtpReceiverInterface>>({
rtc::scoped_refptr<RtpReceiverInterface>(receiver.get()) })));
}
@@ -459,8 +459,8 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
rtp_receivers_.push_back(rtc::scoped_refptr<RtpReceiverInterface>(
rtp_receiver.get()));
}
- EXPECT_CALL(pc_, GetSenders()).WillRepeatedly(Return(rtp_senders_));
- EXPECT_CALL(pc_, GetReceivers()).WillRepeatedly(Return(rtp_receivers_));
+ EXPECT_CALL(*pc_, GetSenders()).WillRepeatedly(Return(rtp_senders_));
+ EXPECT_CALL(*pc_, GetReceivers()).WillRepeatedly(Return(rtp_receivers_));
MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
voice_channel_.reset(new cricket::VoiceChannel(
@@ -492,7 +492,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
cricket::FakeMediaEngine* media_engine_;
std::unique_ptr<cricket::ChannelManager> channel_manager_;
MockWebRtcSession session_;
- MockPeerConnection pc_;
+ rtc::scoped_refptr<MockPeerConnection> pc_;
std::vector<rtc::scoped_refptr<DataChannel>> data_channels_;
std::unique_ptr<cricket::VoiceChannel> voice_channel_;
@@ -979,7 +979,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) {
TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {
test_->data_channels().push_back(
- new MockDataChannel(
+ new rtc::RefCountedObject<MockDataChannel>(
0, "MockDataChannel0", DataChannelInterface::kConnecting, "udp",
1, 2, 3, 4));
RTCDataChannelStats expected_data_channel0("RTCDataChannel_0", 0);
@@ -993,7 +993,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {
expected_data_channel0.bytes_received = 4;
test_->data_channels().push_back(
- new MockDataChannel(
+ new rtc::RefCountedObject<MockDataChannel>(
1, "MockDataChannel1", DataChannelInterface::kOpen, "tcp",
5, 6, 7, 8));
RTCDataChannelStats expected_data_channel1("RTCDataChannel_1", 0);
@@ -1007,7 +1007,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {
expected_data_channel1.bytes_received = 8;
test_->data_channels().push_back(
- new MockDataChannel(
+ new rtc::RefCountedObject<MockDataChannel>(
2, "MockDataChannel2", DataChannelInterface::kClosing, "udp",
9, 10, 11, 12));
RTCDataChannelStats expected_data_channel2("RTCDataChannel_2", 0);
@@ -1021,7 +1021,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {
expected_data_channel2.bytes_received = 12;
test_->data_channels().push_back(
- new MockDataChannel(
+ new rtc::RefCountedObject<MockDataChannel>(
3, "MockDataChannel3", DataChannelInterface::kClosed, "tcp",
13, 14, 15, 16));
RTCDataChannelStats expected_data_channel3("RTCDataChannel_3", 0);
« no previous file with comments | « pc/quicdatachannel.h ('k') | pc/rtpreceiver.h » ('j') | pc/rtpsenderreceiver_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698