Index: media/cast/sender/audio_sender.h |
diff --git a/media/cast/sender/audio_sender.h b/media/cast/sender/audio_sender.h |
index b35dc3b4b2993fcee3a549e72800d2d6d25b6c36..c80b43ad26a458e12ecf18df8068e58b0f4464d3 100644 |
--- a/media/cast/sender/audio_sender.h |
+++ b/media/cast/sender/audio_sender.h |
@@ -5,10 +5,11 @@ |
#ifndef MEDIA_CAST_SENDER_AUDIO_SENDER_H_ |
#define MEDIA_CAST_SENDER_AUDIO_SENDER_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/threading/non_thread_safe.h" |
#include "base/time/tick_clock.h" |
@@ -44,7 +45,7 @@ class AudioSender : public FrameSender, |
// Note: It is not guaranteed that |audio_frame| will actually be encoded and |
// sent, if AudioSender detects too many frames in flight. Therefore, clients |
// should be careful about the rate at which this method is called. |
- void InsertAudio(scoped_ptr<AudioBus> audio_bus, |
+ void InsertAudio(std::unique_ptr<AudioBus> audio_bus, |
const base::TimeTicks& recorded_time); |
protected: |
@@ -54,11 +55,11 @@ class AudioSender : public FrameSender, |
private: |
// Called by the |audio_encoder_| with the next EncodedFrame to send. |
void OnEncodedAudioFrame(int encoder_bitrate, |
- scoped_ptr<SenderEncodedFrame> encoded_frame, |
+ std::unique_ptr<SenderEncodedFrame> encoded_frame, |
int samples_skipped); |
// Encodes AudioBuses into EncodedFrames. |
- scoped_ptr<AudioEncoder> audio_encoder_; |
+ std::unique_ptr<AudioEncoder> audio_encoder_; |
// The number of audio samples enqueued in |audio_encoder_|. |
int samples_in_encoder_; |