| Index: media/base/audio_buffer.h
|
| diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h
|
| index 6d74c7773cfebbdab3294c321901a10241b233e3..9f2ac628477bb106ee38bae1fc38d39518c97eca 100644
|
| --- a/media/base/audio_buffer.h
|
| +++ b/media/base/audio_buffer.h
|
| @@ -8,12 +8,12 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/aligned_memory.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "media/base/channel_layout.h"
|
| #include "media/base/media_export.h"
|
| @@ -182,7 +182,7 @@ class MEDIA_EXPORT AudioBuffer
|
| base::TimeDelta duration_;
|
|
|
| // Contiguous block of channel data.
|
| - scoped_ptr<uint8_t, base::AlignedFreeDeleter> data_;
|
| + std::unique_ptr<uint8_t, base::AlignedFreeDeleter> data_;
|
| size_t data_size_;
|
|
|
| // For planar data, points to each channels data.
|
|
|