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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

Issue 1923133002: Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Don't remove #include "scoped_ptr.h" from .h files Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <memory>
12
11 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
13 15
14 #include "webrtc/common_types.h" 16 #include "webrtc/common_types.h"
15 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitra te_observer.h" 17 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitra te_observer.h"
16 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_singl e_stream.h" 18 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_singl e_stream.h"
17 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 19 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" 20 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
19 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" 21 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
20 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" 22 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 return 0; 140 return 0;
139 } 141 }
140 142
141 OverUseDetectorOptions over_use_detector_options_; 143 OverUseDetectorOptions over_use_detector_options_;
142 SimulatedClock system_clock_; 144 SimulatedClock system_clock_;
143 ModuleRtpRtcpImpl* rtp_rtcp_impl_; 145 ModuleRtpRtcpImpl* rtp_rtcp_impl_;
144 RTCPReceiver* rtcp_receiver_; 146 RTCPReceiver* rtcp_receiver_;
145 TestTransport* test_transport_; 147 TestTransport* test_transport_;
146 RTCPHelp::RTCPPacketInformation rtcp_packet_info_; 148 RTCPHelp::RTCPPacketInformation rtcp_packet_info_;
147 MockRemoteBitrateObserver remote_bitrate_observer_; 149 MockRemoteBitrateObserver remote_bitrate_observer_;
148 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; 150 std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
149 }; 151 };
150 152
151 153
152 TEST_F(RtcpReceiverTest, BrokenPacketIsIgnored) { 154 TEST_F(RtcpReceiverTest, BrokenPacketIsIgnored) {
153 const uint8_t bad_packet[] = {0, 0, 0, 0}; 155 const uint8_t bad_packet[] = {0, 0, 0, 0};
154 EXPECT_EQ(0, InjectRtcpPacket(bad_packet, sizeof(bad_packet))); 156 EXPECT_EQ(0, InjectRtcpPacket(bad_packet, sizeof(bad_packet)));
155 EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags); 157 EXPECT_EQ(0U, rtcp_packet_info_.rtcpPacketTypeFlags);
156 } 158 }
157 159
158 TEST_F(RtcpReceiverTest, InvalidFeedbackPacketIsIgnored) { 160 TEST_F(RtcpReceiverTest, InvalidFeedbackPacketIsIgnored) {
(...skipping 1128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 1289
1288 // Transport feedback should be ignored, but next packet should work. 1290 // Transport feedback should be ignored, but next packet should work.
1289 EXPECT_EQ(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpTransportFeedback); 1291 EXPECT_EQ(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpTransportFeedback);
1290 EXPECT_NE(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpRemb); 1292 EXPECT_NE(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpRemb);
1291 EXPECT_EQ(kBitrateBps, rtcp_packet_info_.receiverEstimatedMaxBitrate); 1293 EXPECT_EQ(kBitrateBps, rtcp_packet_info_.receiverEstimatedMaxBitrate);
1292 } 1294 }
1293 1295
1294 } // Anonymous namespace 1296 } // Anonymous namespace
1295 1297
1296 } // namespace webrtc 1298 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698