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

Unified Diff: media/cast/cast_sender_impl.h

Issue 1905763002: Convert //media/cast 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/cast/cast_sender.h ('k') | media/cast/cast_sender_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/cast_sender_impl.h
diff --git a/media/cast/cast_sender_impl.h b/media/cast/cast_sender_impl.h
index 23ad0460c35a8707fcda3cdf3f23aed92284140d..511c458c333b9678f00616a96b3b22a3d765a261 100644
--- a/media/cast/cast_sender_impl.h
+++ b/media/cast/cast_sender_impl.h
@@ -4,9 +4,10 @@
#ifndef MEDIA_CAST_CAST_SENDER_IMPL_H_
#define MEDIA_CAST_CAST_SENDER_IMPL_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "media/cast/cast_environment.h"
#include "media/cast/cast_sender.h"
#include "media/cast/sender/audio_sender.h"
@@ -43,14 +44,14 @@ class CastSenderImpl : public CastSender {
scoped_refptr<VideoFrameInput> video_frame_input() final;
private:
- void ReceivedPacket(scoped_ptr<Packet> packet);
+ void ReceivedPacket(std::unique_ptr<Packet> packet);
void OnAudioStatusChange(const StatusChangeCallback& status_change_cb,
OperationalStatus status);
void OnVideoStatusChange(const StatusChangeCallback& status_change_cb,
OperationalStatus status);
- scoped_ptr<AudioSender> audio_sender_;
- scoped_ptr<VideoSender> video_sender_;
+ std::unique_ptr<AudioSender> audio_sender_;
+ std::unique_ptr<VideoSender> video_sender_;
scoped_refptr<AudioFrameInput> audio_frame_input_;
scoped_refptr<VideoFrameInput> video_frame_input_;
scoped_refptr<CastEnvironment> cast_environment_;
« no previous file with comments | « media/cast/cast_sender.h ('k') | media/cast/cast_sender_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698