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

Unified Diff: media/base/decoder_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/data_buffer_unittest.cc ('k') | media/base/decoder_buffer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decoder_buffer.h
diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h
index 9010eaa3172d655d59625d67728a4ccb272216ae..64a881093343111d9e77dce584bc105491906c51 100644
--- a/media/base/decoder_buffer.h
+++ b/media/base/decoder_buffer.h
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
#include <string>
#include <utility>
@@ -15,7 +16,6 @@
#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 "build/build_config.h"
#include "media/base/decrypt_config.h"
@@ -138,7 +138,7 @@ class MEDIA_EXPORT DecoderBuffer
return decrypt_config_.get();
}
- void set_decrypt_config(scoped_ptr<DecryptConfig> decrypt_config) {
+ void set_decrypt_config(std::unique_ptr<DecryptConfig> decrypt_config) {
DCHECK(!end_of_stream());
decrypt_config_ = std::move(decrypt_config);
}
@@ -196,10 +196,10 @@ class MEDIA_EXPORT DecoderBuffer
base::TimeDelta duration_;
size_t size_;
- scoped_ptr<uint8_t, base::AlignedFreeDeleter> data_;
+ std::unique_ptr<uint8_t, base::AlignedFreeDeleter> data_;
size_t side_data_size_;
- scoped_ptr<uint8_t, base::AlignedFreeDeleter> side_data_;
- scoped_ptr<DecryptConfig> decrypt_config_;
+ std::unique_ptr<uint8_t, base::AlignedFreeDeleter> side_data_;
+ std::unique_ptr<DecryptConfig> decrypt_config_;
DiscardPadding discard_padding_;
base::TimeDelta splice_timestamp_;
bool is_key_frame_;
« no previous file with comments | « media/base/data_buffer_unittest.cc ('k') | media/base/decoder_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698