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

Unified Diff: media/blink/texttrack_impl.h

Issue 1904253002: Convert //media/blink 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
« no previous file with comments | « media/blink/run_all_unittests.cc ('k') | media/blink/texttrack_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/texttrack_impl.h
diff --git a/media/blink/texttrack_impl.h b/media/blink/texttrack_impl.h
index 5ebb65739ccd8396fd22953ae373e3a6922c8672..8cb670a45f0be2f7bea20d4a7c97b60c1f9f91b2 100644
--- a/media/blink/texttrack_impl.h
+++ b/media/blink/texttrack_impl.h
@@ -5,10 +5,10 @@
#ifndef MEDIA_BLINK_TEXTTRACK_IMPL_H_
#define MEDIA_BLINK_TEXTTRACK_IMPL_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/base/text_track.h"
namespace base {
@@ -29,7 +29,7 @@ class TextTrackImpl : public TextTrack {
// Constructor assumes ownership of the |text_track| object.
TextTrackImpl(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
blink::WebMediaPlayerClient* client,
- scoped_ptr<WebInbandTextTrackImpl> text_track);
+ std::unique_ptr<WebInbandTextTrackImpl> text_track);
~TextTrackImpl() override;
@@ -48,11 +48,11 @@ class TextTrackImpl : public TextTrack {
const std::string& settings);
static void OnRemoveTrack(blink::WebMediaPlayerClient* client,
- scoped_ptr<WebInbandTextTrackImpl> text_track);
+ std::unique_ptr<WebInbandTextTrackImpl> text_track);
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
blink::WebMediaPlayerClient* client_;
- scoped_ptr<WebInbandTextTrackImpl> text_track_;
+ std::unique_ptr<WebInbandTextTrackImpl> text_track_;
DISALLOW_COPY_AND_ASSIGN(TextTrackImpl);
};
« no previous file with comments | « media/blink/run_all_unittests.cc ('k') | media/blink/texttrack_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698