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

Unified Diff: media/base/demuxer.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/decrypt_config.h ('k') | media/base/demuxer_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer.h
diff --git a/media/base/demuxer.h b/media/base/demuxer.h
index 027264ba79fb916f0359a983d4f4dc4519ccba80..9c6607f9cb212555c5eee02d494b2b2e407d52a5 100644
--- a/media/base/demuxer.h
+++ b/media/base/demuxer.h
@@ -7,10 +7,10 @@
#include <stdint.h>
+#include <memory>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "media/base/data_source.h"
#include "media/base/demuxer_stream.h"
@@ -62,14 +62,15 @@ class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider {
// A new potentially encrypted stream has been parsed.
// First parameter - The type of initialization data.
// Second parameter - The initialization data associated with the stream.
- typedef base::Callback<void(EmeInitDataType type,
- const std::vector<uint8_t>& init_data)>
- EncryptedMediaInitDataCB;
+ using EncryptedMediaInitDataCB =
+ base::Callback<void(EmeInitDataType type,
+ const std::vector<uint8_t>& init_data)>;
// Notifies demuxer clients that media track configuration has been updated
// (e.g. the inital stream metadata has been parsed successfully, or a new
// init segment has been parsed successfully in MSE case).
- typedef base::Callback<void(scoped_ptr<MediaTracks>)> MediaTracksUpdatedCB;
+ using MediaTracksUpdatedCB =
+ base::Callback<void(std::unique_ptr<MediaTracks>)>;
Demuxer();
~Demuxer() override;
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/base/demuxer_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698