webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc - Issue 1694073002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

Issue 1694073002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-actest

Patch Set: Created 4 years, 10 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

« webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc ('K') | « webrtc/modules/audio_coding/acm2/acm_receiver.h ('k') | webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

index 24ecc694ffba4052086111592a01448f432e9641..a0f4e0e0192226cc4978f2e3f107793584112e0f 100644

--- a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

+++ b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

@@ -11,9 +11,9 @@

#include "webrtc/modules/audio_coding/acm2/acm_receiver.h"

#include <algorithm> // std::min

+#include <memory>

#include "testing/gtest/include/gtest/gtest.h"

-#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/audio_coding/include/audio_coding_module.h"

#include "webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h"

#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"

@@ -153,9 +153,9 @@ class AcmReceiverTestOldApi : public AudioPacketizationCallback,

return 0;

}

- rtc::scoped_ptr<AcmReceiver> receiver_;

+ std::unique_ptr<AcmReceiver> receiver_;

rtc::ArrayView<const CodecInst> codecs_;

- rtc::scoped_ptr<AudioCodingModule> acm_;

+ std::unique_ptr<AudioCodingModule> acm_;

WebRtcRTPHeader rtp_header_;

uint32_t timestamp_;

bool packet_sent_; // Set when SendData is called reset when inserting audio.