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

Unified Diff: media/formats/webm/webm_cluster_parser.h

Issue 1874413003: Convert media/formats to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: media/formats/webm/webm_cluster_parser.h
diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h
index c7195159328ee6476643a025dc356be548c37bd3..415b81ac5549c97832bfa41198acb2dc6986f06d 100644
--- a/media/formats/webm/webm_cluster_parser.h
+++ b/media/formats/webm/webm_cluster_parser.h
@@ -9,11 +9,11 @@
#include <deque>
#include <map>
+#include <memory>
#include <set>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/media_export.h"
#include "media/base/media_log.h"
@@ -285,12 +285,12 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
WebMListParser parser_;
int64_t last_block_timecode_ = -1;
- scoped_ptr<uint8_t[]> block_data_;
+ std::unique_ptr<uint8_t[]> block_data_;
int block_data_size_ = -1;
int64_t block_duration_ = -1;
int64_t block_add_id_ = -1;
- scoped_ptr<uint8_t[]> block_additional_data_;
+ std::unique_ptr<uint8_t[]> block_additional_data_;
// Must be 0 if |block_additional_data_| is null. Must be > 0 if
// |block_additional_data_| is NOT null.
int block_additional_data_size_ = 0;

Powered by Google App Engine
This is Rietveld 408576698