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

Unified Diff: chromecast/media/cma/base/decoder_buffer_base.h

Issue 1875623002: Convert //chromecast from scoped_ptr 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: chromecast/media/cma/base/decoder_buffer_base.h
diff --git a/chromecast/media/cma/base/decoder_buffer_base.h b/chromecast/media/cma/base/decoder_buffer_base.h
index 34710a52431c11261590ebcd4244a795c8dca24f..40298203ef4eb214fc53609846332472d7635c87 100644
--- a/chromecast/media/cma/base/decoder_buffer_base.h
+++ b/chromecast/media/cma/base/decoder_buffer_base.h
@@ -6,11 +6,12 @@
#define CHROMECAST_MEDIA_CMA_BASE_DECODER_BUFFER_BASE_H_
#include <stdint.h>
+
+#include <memory>
#include <utility>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "chromecast/public/media/cast_decoder_buffer.h"
#include "chromecast/public/media/decrypt_context.h"
@@ -31,7 +32,7 @@ class DecoderBufferBase : public CastDecoderBuffer,
// Partial CastDecoderBuffer implementation:
DecryptContext* decrypt_context() const override;
- void set_decrypt_context(scoped_ptr<DecryptContext> context) {
+ void set_decrypt_context(std::unique_ptr<DecryptContext> context) {
decrypt_context_ = std::move(context);
}
@@ -50,7 +51,7 @@ class DecoderBufferBase : public CastDecoderBuffer,
~DecoderBufferBase() override;
private:
- scoped_ptr<DecryptContext> decrypt_context_;
+ std::unique_ptr<DecryptContext> decrypt_context_;
DISALLOW_COPY_AND_ASSIGN(DecoderBufferBase);
};
« no previous file with comments | « chromecast/media/cma/base/decoder_buffer_adapter.h ('k') | chromecast/media/cma/base/demuxer_stream_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698