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

Unified Diff: media/audio/fake_audio_input_stream.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cast + windows build 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 side-by-side diff with in-line comments
Download patch
Index: media/audio/fake_audio_input_stream.h
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index b3f1ea4ff875821c5ccf99e443725d43bd125a39..8b42d1f96c39e746cfdccff8a167e518ff327107 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -7,11 +7,11 @@
#ifndef MEDIA_AUDIO_FAKE_AUDIO_INPUT_STREAM_H_
#define MEDIA_AUDIO_FAKE_AUDIO_INPUT_STREAM_H_
+#include <memory>
#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/fake_audio_worker.h"
@@ -60,7 +60,7 @@ class MEDIA_EXPORT FakeAudioInputStream
const AudioParameters& params);
~FakeAudioInputStream() override;
- scoped_ptr<AudioOutputStream::AudioSourceCallback> ChooseSource();
+ std::unique_ptr<AudioOutputStream::AudioSourceCallback> ChooseSource();
void ReadAudioFromSource();
AudioManagerBase* audio_manager_;
@@ -68,8 +68,8 @@ class MEDIA_EXPORT FakeAudioInputStream
FakeAudioWorker fake_audio_worker_;
AudioParameters params_;
- scoped_ptr<AudioOutputStream::AudioSourceCallback> audio_source_;
- scoped_ptr<media::AudioBus> audio_bus_;
+ std::unique_ptr<AudioOutputStream::AudioSourceCallback> audio_source_;
+ std::unique_ptr<media::AudioBus> audio_bus_;
DISALLOW_COPY_AND_ASSIGN(FakeAudioInputStream);
};

Powered by Google App Engine
This is Rietveld 408576698