Chromium Code Reviews| Index: media/audio/alsa/alsa_input.h |
| diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h |
| index f0b6d6948722ac8cce4221f0a32cd75210795a66..e51e476b26d28200ab04b07f4778acf853077037 100644 |
| --- a/media/audio/alsa/alsa_input.h |
| +++ b/media/audio/alsa/alsa_input.h |
| @@ -8,11 +8,11 @@ |
| #include <alsa/asoundlib.h> |
| #include <stdint.h> |
| +#include <memory> |
| #include <string> |
| #include "base/compiler_specific.h" |
| #include "base/macros.h" |
| -#include "base/memory/scoped_ptr.h" |
| #include "base/memory/weak_ptr.h" |
| #include "base/time/time.h" |
| #include "media/audio/agc_audio_stream.h" |
| @@ -83,9 +83,10 @@ class AlsaPcmInputStream : public AgcAudioStream<AudioInputStream> { |
| snd_pcm_t* device_handle_; // Handle to the ALSA PCM recording device. |
| snd_mixer_t* mixer_handle_; // Handle to the ALSA microphone mixer. |
| snd_mixer_elem_t* mixer_element_handle_; // Handle to the capture element. |
| - scoped_ptr<uint8_t[]> audio_buffer_; // Buffer used for reading audio data. |
| + std::unique_ptr<uint8_t[]> |
| + audio_buffer_; // Buffer used for reading audio data. |
|
danakj
2016/04/22 22:47:35
move the comment above the variable to its own lin
dcheng
2016/04/22 23:13:19
Done.
|
| bool read_callback_behind_schedule_; |
| - scoped_ptr<AudioBus> audio_bus_; |
| + std::unique_ptr<AudioBus> audio_bus_; |
| // NOTE: Weak pointers must be invalidated before all other member variables. |
| base::WeakPtrFactory<AlsaPcmInputStream> weak_factory_; |