Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(847)

Unified Diff: media/base/audio_buffer.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/audio_block_fifo_unittest.cc ('k') | media/base/audio_buffer_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « media/base/audio_block_fifo_unittest.cc ('k') | media/base/audio_buffer_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698