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

Unified Diff: media/base/media_tracks.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/media_log_event.h ('k') | media/base/media_tracks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_tracks.h
diff --git a/media/base/media_tracks.h b/media/base/media_tracks.h
index 4e0fbb0fc1f88195ce14cc05d14a424924be4d5d..ea4a38c18d8bbb3dc05dcee23c5ee82966eb97f0 100644
--- a/media/base/media_tracks.h
+++ b/media/base/media_tracks.h
@@ -6,11 +6,11 @@
#define MEDIA_BASE_MEDIA_TRACKS_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/base/media_export.h"
#include "media/base/media_track.h"
@@ -21,7 +21,7 @@ class VideoDecoderConfig;
class MEDIA_EXPORT MediaTracks {
public:
- typedef std::vector<scoped_ptr<MediaTrack>> MediaTracksCollection;
+ using MediaTracksCollection = std::vector<std::unique_ptr<MediaTrack>>;
MediaTracks();
~MediaTracks();
« no previous file with comments | « media/base/media_log_event.h ('k') | media/base/media_tracks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698