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

Unified Diff: media/cast/test/loopback_transport.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/test/loopback_transport.h ('k') | media/cast/test/receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/loopback_transport.cc
diff --git a/media/cast/test/loopback_transport.cc b/media/cast/test/loopback_transport.cc
index d82dcbdf2db4ed415a0c26fe388df32c7e30381b..3500f628285f690e2324337b3557490a3a17a424 100644
--- a/media/cast/test/loopback_transport.cc
+++ b/media/cast/test/loopback_transport.cc
@@ -26,7 +26,7 @@ class LoopBackPacketPipe : public test::PacketPipe {
~LoopBackPacketPipe() final {}
// PacketPipe implementations.
- void Send(scoped_ptr<Packet> packet) final {
+ void Send(std::unique_ptr<Packet> packet) final {
packet_receiver_.Run(std::move(packet));
}
@@ -50,7 +50,7 @@ LoopBackTransport::~LoopBackTransport() {
bool LoopBackTransport::SendPacket(PacketRef packet,
const base::Closure& cb) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
- scoped_ptr<Packet> packet_copy(new Packet(packet->data));
+ std::unique_ptr<Packet> packet_copy(new Packet(packet->data));
packet_pipe_->Send(std::move(packet_copy));
bytes_sent_ += packet->data.size();
return true;
@@ -61,11 +61,11 @@ int64_t LoopBackTransport::GetBytesSent() {
}
void LoopBackTransport::Initialize(
- scoped_ptr<test::PacketPipe> pipe,
+ std::unique_ptr<test::PacketPipe> pipe,
const PacketReceiverCallback& packet_receiver,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
base::TickClock* clock) {
- scoped_ptr<test::PacketPipe> loopback_pipe(
+ std::unique_ptr<test::PacketPipe> loopback_pipe(
new LoopBackPacketPipe(packet_receiver));
if (pipe) {
// Append the loopback pipe to the end.
« no previous file with comments | « media/cast/test/loopback_transport.h ('k') | media/cast/test/receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698