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

Unified Diff: media/base/stream_parser.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/sinc_resampler_unittest.cc ('k') | media/base/stream_parser_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/stream_parser.h
diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h
index fed228c50c2d087e01b2c68b4f0fce15a30be757..f640c5c94d72764157300f742e39d0c96f6334ae 100644
--- a/media/base/stream_parser.h
+++ b/media/base/stream_parser.h
@@ -10,13 +10,13 @@
#include <deque>
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "media/base/demuxer_stream.h"
#include "media/base/eme_constants.h"
@@ -32,7 +32,7 @@ class TextTrackConfig;
// Abstract interface for parsing media byte streams.
class MEDIA_EXPORT StreamParser {
public:
- typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
+ using BufferQueue = std::deque<scoped_refptr<StreamParserBuffer>>;
// Range of |TrackId| is dependent upon stream parsers. It is currently
// the key for the buffer's text track config in the applicable
@@ -89,7 +89,7 @@ class MEDIA_EXPORT StreamParser {
// Return value - True if the new configurations are accepted.
// False if the new configurations are not supported
// and indicates that a parsing error should be signalled.
- typedef base::Callback<bool(scoped_ptr<MediaTracks>,
+ typedef base::Callback<bool(std::unique_ptr<MediaTracks>,
const TextTrackConfigMap&)>
NewConfigCB;
« no previous file with comments | « media/base/sinc_resampler_unittest.cc ('k') | media/base/stream_parser_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698