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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/receive_statistics_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, 8 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #include "webrtc/base/scoped_ptr.h"
14 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 15 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
15 #include "webrtc/system_wrappers/include/clock.h" 16 #include "webrtc/system_wrappers/include/clock.h"
16 17
17 namespace webrtc { 18 namespace webrtc {
18 19
19 const size_t kPacketSize1 = 100; 20 const size_t kPacketSize1 = 100;
20 const size_t kPacketSize2 = 300; 21 const size_t kPacketSize2 = 300;
21 const uint32_t kSsrc1 = 1; 22 const uint32_t kSsrc1 = 1;
22 const uint32_t kSsrc2 = 2; 23 const uint32_t kSsrc2 = 2;
23 24
24 class ReceiveStatisticsTest : public ::testing::Test { 25 class ReceiveStatisticsTest : public ::testing::Test {
25 public: 26 public:
26 ReceiveStatisticsTest() : 27 ReceiveStatisticsTest() :
27 clock_(0), 28 clock_(0),
28 receive_statistics_(ReceiveStatistics::Create(&clock_)) { 29 receive_statistics_(ReceiveStatistics::Create(&clock_)) {
29 memset(&header1_, 0, sizeof(header1_)); 30 memset(&header1_, 0, sizeof(header1_));
30 header1_.ssrc = kSsrc1; 31 header1_.ssrc = kSsrc1;
31 header1_.sequenceNumber = 100; 32 header1_.sequenceNumber = 100;
32 memset(&header2_, 0, sizeof(header2_)); 33 memset(&header2_, 0, sizeof(header2_));
33 header2_.ssrc = kSsrc2; 34 header2_.ssrc = kSsrc2;
34 header2_.sequenceNumber = 100; 35 header2_.sequenceNumber = 100;
35 } 36 }
36 37
37 protected: 38 protected:
38 SimulatedClock clock_; 39 SimulatedClock clock_;
39 rtc::scoped_ptr<ReceiveStatistics> receive_statistics_; 40 std::unique_ptr<ReceiveStatistics> receive_statistics_;
40 RTPHeader header1_; 41 RTPHeader header1_;
41 RTPHeader header2_; 42 RTPHeader header2_;
42 }; 43 };
43 44
44 TEST_F(ReceiveStatisticsTest, TwoIncomingSsrcs) { 45 TEST_F(ReceiveStatisticsTest, TwoIncomingSsrcs) {
45 receive_statistics_->IncomingPacket(header1_, kPacketSize1, false); 46 receive_statistics_->IncomingPacket(header1_, kPacketSize1, false);
46 ++header1_.sequenceNumber; 47 ++header1_.sequenceNumber;
47 receive_statistics_->IncomingPacket(header2_, kPacketSize2, false); 48 receive_statistics_->IncomingPacket(header2_, kPacketSize2, false);
48 ++header2_.sequenceNumber; 49 ++header2_.sequenceNumber;
49 clock_.AdvanceTimeMilliseconds(100); 50 clock_.AdvanceTimeMilliseconds(100);
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 callback.Matches(1, kSsrc1, expected); 373 callback.Matches(1, kSsrc1, expected);
373 374
374 receive_statistics_->FecPacketReceived(header1_, 375 receive_statistics_->FecPacketReceived(header1_,
375 kPacketSize1 + kHeaderLength); 376 kPacketSize1 + kHeaderLength);
376 expected.fec.payload_bytes = kPacketSize1; 377 expected.fec.payload_bytes = kPacketSize1;
377 expected.fec.header_bytes = kHeaderLength; 378 expected.fec.header_bytes = kHeaderLength;
378 expected.fec.packets = 1; 379 expected.fec.packets = 1;
379 callback.Matches(2, kSsrc1, expected); 380 callback.Matches(2, kSsrc1, expected);
380 } 381 }
381 } // namespace webrtc 382 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698