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

Unified Diff: webrtc/modules/audio_coding/test/TwoWayCommunication.h

Issue 1695763004: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/test/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-neteq
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
Index: webrtc/modules/audio_coding/test/TwoWayCommunication.h
diff --git a/webrtc/modules/audio_coding/test/TwoWayCommunication.h b/webrtc/modules/audio_coding/test/TwoWayCommunication.h
index 77639935da903169e61234d0d734b15e5ebc0366..f9d37f7f77f6d37a0fd5d94661edc68b598dedf8 100644
--- a/webrtc/modules/audio_coding/test/TwoWayCommunication.h
+++ b/webrtc/modules/audio_coding/test/TwoWayCommunication.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_
#define WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_
-#include "webrtc/base/scoped_ptr.h"
+#include <memory>
+
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/test/ACMTest.h"
#include "webrtc/modules/audio_coding/test/Channel.h"
@@ -31,11 +32,11 @@ class TwoWayCommunication : public ACMTest {
void SetUp();
void SetUpAutotest();
- rtc::scoped_ptr<AudioCodingModule> _acmA;
- rtc::scoped_ptr<AudioCodingModule> _acmB;
+ std::unique_ptr<AudioCodingModule> _acmA;
+ std::unique_ptr<AudioCodingModule> _acmB;
- rtc::scoped_ptr<AudioCodingModule> _acmRefA;
- rtc::scoped_ptr<AudioCodingModule> _acmRefB;
+ std::unique_ptr<AudioCodingModule> _acmRefA;
+ std::unique_ptr<AudioCodingModule> _acmRefB;
Channel* _channel_A2B;
Channel* _channel_B2A;
« no previous file with comments | « webrtc/modules/audio_coding/test/TestVADDTX.h ('k') | webrtc/modules/audio_coding/test/TwoWayCommunication.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698