Index: media/audio/mac/audio_low_latency_input_mac.h |
diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h |
index e17b3a8cbfd9506e9f875d9d43141f9b246e20b9..332828b783f3c978a215ec96095b30bf0dca6b3c 100644 |
--- a/media/audio/mac/audio_low_latency_input_mac.h |
+++ b/media/audio/mac/audio_low_latency_input_mac.h |
@@ -38,13 +38,14 @@ |
#include <AudioUnit/AudioUnit.h> |
#include <CoreAudio/CoreAudio.h> |
+ |
#include <map> |
+#include <memory> |
#include <vector> |
#include "base/atomicops.h" |
#include "base/cancelable_callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/threading/thread_checker.h" |
#include "base/time/time.h" |
@@ -229,7 +230,7 @@ class MEDIA_EXPORT AUAudioInputStream |
// Temporary storage for recorded data. The InputProc() renders into this |
// array as soon as a frame of the desired buffer size has been recorded. |
- scoped_ptr<uint8_t[]> audio_data_buffer_; |
+ std::unique_ptr<uint8_t[]> audio_data_buffer_; |
// Fixed capture hardware latency in frames. |
double hardware_latency_frames_; |
@@ -257,7 +258,7 @@ class MEDIA_EXPORT AUAudioInputStream |
// Timer which triggers CheckInputStartupSuccess() to verify that input |
// callbacks have started as intended after a successful call to Start(). |
// This timer lives on the main browser thread. |
- scoped_ptr<base::OneShotTimer> input_callback_timer_; |
+ std::unique_ptr<base::OneShotTimer> input_callback_timer_; |
// Set to true if the Start() call was delayed. |
// See AudioManagerMac::ShouldDeferStreamStart() for details. |
@@ -301,7 +302,7 @@ class MEDIA_EXPORT AUAudioInputStream |
// Timer that provides periodic callbacks used to monitor if the input stream |
// is alive or not. |
- scoped_ptr<base::RepeatingTimer> check_alive_timer_; |
+ std::unique_ptr<base::RepeatingTimer> check_alive_timer_; |
// Time tick set once in each input data callback. The time is measured on |
// the real-time priority I/O thread but this member is modified and read |