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

Side by Side Diff: webrtc/modules/pacing/packet_router_unittest.cc

Issue 1785173002: Replace scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up8
Patch Set: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 <list> 11 #include <list>
12 #include <memory>
12 13
13 #include "webrtc/base/checks.h" 14 #include "webrtc/base/checks.h"
14 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webrtc/modules/pacing/packet_router.h" 17 #include "webrtc/modules/pacing/packet_router.h"
17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
18 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" 19 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
19 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" 20 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
20 #include "webrtc/base/scoped_ptr.h"
21 21
22 using ::testing::_; 22 using ::testing::_;
23 using ::testing::AnyNumber; 23 using ::testing::AnyNumber;
24 using ::testing::NiceMock; 24 using ::testing::NiceMock;
25 using ::testing::Return; 25 using ::testing::Return;
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 class PacketRouterTest : public ::testing::Test { 29 class PacketRouterTest : public ::testing::Test {
30 public: 30 public:
31 PacketRouterTest() : packet_router_(new PacketRouter()) {} 31 PacketRouterTest() : packet_router_(new PacketRouter()) {}
32 protected: 32 protected:
33 const rtc::scoped_ptr<PacketRouter> packet_router_; 33 const std::unique_ptr<PacketRouter> packet_router_;
34 }; 34 };
35 35
36 TEST_F(PacketRouterTest, TimeToSendPacket) { 36 TEST_F(PacketRouterTest, TimeToSendPacket) {
37 MockRtpRtcp rtp_1; 37 MockRtpRtcp rtp_1;
38 MockRtpRtcp rtp_2; 38 MockRtpRtcp rtp_2;
39 packet_router_->AddRtpModule(&rtp_1); 39 packet_router_->AddRtpModule(&rtp_1);
40 packet_router_->AddRtpModule(&rtp_2); 40 packet_router_->AddRtpModule(&rtp_2);
41 41
42 const uint16_t kSsrc1 = 1234; 42 const uint16_t kSsrc1 = 1234;
43 uint16_t sequence_number = 17; 43 uint16_t sequence_number = 17;
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 rtcp::TransportFeedback feedback; 197 rtcp::TransportFeedback feedback;
198 EXPECT_CALL(rtp_1, SendFeedbackPacket(_)).Times(1); 198 EXPECT_CALL(rtp_1, SendFeedbackPacket(_)).Times(1);
199 packet_router_->SendFeedback(&feedback); 199 packet_router_->SendFeedback(&feedback);
200 packet_router_->RemoveRtpModule(&rtp_1); 200 packet_router_->RemoveRtpModule(&rtp_1);
201 EXPECT_CALL(rtp_2, SendFeedbackPacket(_)).Times(1); 201 EXPECT_CALL(rtp_2, SendFeedbackPacket(_)).Times(1);
202 packet_router_->SendFeedback(&feedback); 202 packet_router_->SendFeedback(&feedback);
203 packet_router_->RemoveRtpModule(&rtp_2); 203 packet_router_->RemoveRtpModule(&rtp_2);
204 } 204 }
205 } // namespace webrtc 205 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698