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

Unified Diff: media/cast/logging/log_event_dispatcher.cc

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/logging/log_event_dispatcher.h ('k') | media/cast/logging/log_serializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/logging/log_event_dispatcher.cc
diff --git a/media/cast/logging/log_event_dispatcher.cc b/media/cast/logging/log_event_dispatcher.cc
index 428a642808b993385c7310c03c3f8975e9cd6308..e9d937e354ede9c058c8701bb15f522131ffddc2 100644
--- a/media/cast/logging/log_event_dispatcher.cc
+++ b/media/cast/logging/log_event_dispatcher.cc
@@ -24,7 +24,7 @@ LogEventDispatcher::LogEventDispatcher(CastEnvironment* env)
LogEventDispatcher::~LogEventDispatcher() {}
void LogEventDispatcher::DispatchFrameEvent(
- scoped_ptr<FrameEvent> event) const {
+ std::unique_ptr<FrameEvent> event) const {
if (env_->CurrentlyOn(CastEnvironment::MAIN)) {
impl_->DispatchFrameEvent(std::move(event));
} else {
@@ -35,7 +35,7 @@ void LogEventDispatcher::DispatchFrameEvent(
}
void LogEventDispatcher::DispatchPacketEvent(
- scoped_ptr<PacketEvent> event) const {
+ std::unique_ptr<PacketEvent> event) const {
if (env_->CurrentlyOn(CastEnvironment::MAIN)) {
impl_->DispatchPacketEvent(std::move(event));
} else {
@@ -46,8 +46,8 @@ void LogEventDispatcher::DispatchPacketEvent(
}
void LogEventDispatcher::DispatchBatchOfEvents(
- scoped_ptr<std::vector<FrameEvent>> frame_events,
- scoped_ptr<std::vector<PacketEvent>> packet_events) const {
+ std::unique_ptr<std::vector<FrameEvent>> frame_events,
+ std::unique_ptr<std::vector<PacketEvent>> packet_events) const {
if (env_->CurrentlyOn(CastEnvironment::MAIN)) {
impl_->DispatchBatchOfEvents(std::move(frame_events),
std::move(packet_events));
@@ -100,20 +100,20 @@ LogEventDispatcher::Impl::~Impl() {
}
void LogEventDispatcher::Impl::DispatchFrameEvent(
- scoped_ptr<FrameEvent> event) const {
+ std::unique_ptr<FrameEvent> event) const {
for (RawEventSubscriber* s : subscribers_)
s->OnReceiveFrameEvent(*event);
}
void LogEventDispatcher::Impl::DispatchPacketEvent(
- scoped_ptr<PacketEvent> event) const {
+ std::unique_ptr<PacketEvent> event) const {
for (RawEventSubscriber* s : subscribers_)
s->OnReceivePacketEvent(*event);
}
void LogEventDispatcher::Impl::DispatchBatchOfEvents(
- scoped_ptr<std::vector<FrameEvent>> frame_events,
- scoped_ptr<std::vector<PacketEvent>> packet_events) const {
+ std::unique_ptr<std::vector<FrameEvent>> frame_events,
+ std::unique_ptr<std::vector<PacketEvent>> packet_events) const {
for (RawEventSubscriber* s : subscribers_) {
for (const FrameEvent& e : *frame_events)
s->OnReceiveFrameEvent(e);
« no previous file with comments | « media/cast/logging/log_event_dispatcher.h ('k') | media/cast/logging/log_serializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698