Index: webrtc/modules/audio_device/mac/audio_device_mac.h |
diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h |
index ca3a51997daf3b1fabeb956524a052e2928bb09c..102c67e97cb0fdd60738d6ba321cb0b6946e0b96 100644 |
--- a/webrtc/modules/audio_device/mac/audio_device_mac.h |
+++ b/webrtc/modules/audio_device/mac/audio_device_mac.h |
@@ -11,7 +11,8 @@ |
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H |
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H |
-#include "webrtc/base/scoped_ptr.h" |
+#include <memory> |
+ |
#include "webrtc/base/thread_annotations.h" |
#include "webrtc/modules/audio_device/audio_device_generic.h" |
#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" |
@@ -290,10 +291,10 @@ class AudioDeviceMac : public AudioDeviceGeneric { |
// TODO(pbos): Replace with direct members, just start/stop, no need to |
// recreate the thread. |
// Only valid/running between calls to StartRecording and StopRecording. |
- rtc::scoped_ptr<rtc::PlatformThread> capture_worker_thread_; |
+ std::unique_ptr<rtc::PlatformThread> capture_worker_thread_; |
// Only valid/running between calls to StartPlayout and StopPlayout. |
- rtc::scoped_ptr<rtc::PlatformThread> render_worker_thread_; |
+ std::unique_ptr<rtc::PlatformThread> render_worker_thread_; |
int32_t _id; |