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

Unified Diff: webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
diff --git a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
index f393e0f029b3d49e617947c370d0eb236ef06bf2..e553e45b7163cebd7f2b45274d296276eb1a0d50 100644
--- a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
+++ b/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
+
#include "testing/gmock/include/gmock/gmock.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
@@ -56,7 +57,7 @@ TEST(AudioConferenceMixer, AnonymousAndNamed) {
const int kAnonymous =
AudioConferenceMixer::kMaximumAmountOfMixedParticipants + 1;
- rtc::scoped_ptr<AudioConferenceMixer> mixer(
+ std::unique_ptr<AudioConferenceMixer> mixer(
AudioConferenceMixer::Create(kId));
MockMixerParticipant named[kNamed];
@@ -108,7 +109,7 @@ TEST(AudioConferenceMixer, LargestEnergyVadActiveMixed) {
AudioConferenceMixer::kMaximumAmountOfMixedParticipants + 3;
const int kSampleRateHz = 32000;
- rtc::scoped_ptr<AudioConferenceMixer> mixer(
+ std::unique_ptr<AudioConferenceMixer> mixer(
AudioConferenceMixer::Create(kId));
MockAudioMixerOutputReceiver output_receiver;

Powered by Google App Engine
This is Rietveld 408576698