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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/test/loopback_transport.h" 5 #include "media/cast/test/loopback_transport.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/time/tick_clock.h" 11 #include "base/time/tick_clock.h"
12 #include "media/cast/test/utility/udp_proxy.h" 12 #include "media/cast/test/utility/udp_proxy.h"
13 13
14 namespace media { 14 namespace media {
15 namespace cast { 15 namespace cast {
16 namespace { 16 namespace {
17 17
18 // Shim that turns forwards packets from a test::PacketPipe to a 18 // Shim that turns forwards packets from a test::PacketPipe to a
19 // PacketReceiverCallback. 19 // PacketReceiverCallback.
20 class LoopBackPacketPipe : public test::PacketPipe { 20 class LoopBackPacketPipe : public test::PacketPipe {
21 public: 21 public:
22 LoopBackPacketPipe( 22 LoopBackPacketPipe(
23 const PacketReceiverCallback& packet_receiver) 23 const PacketReceiverCallback& packet_receiver)
24 : packet_receiver_(packet_receiver) {} 24 : packet_receiver_(packet_receiver) {}
25 25
26 ~LoopBackPacketPipe() final {} 26 ~LoopBackPacketPipe() final {}
27 27
28 // PacketPipe implementations. 28 // PacketPipe implementations.
29 void Send(scoped_ptr<Packet> packet) final { 29 void Send(std::unique_ptr<Packet> packet) final {
30 packet_receiver_.Run(std::move(packet)); 30 packet_receiver_.Run(std::move(packet));
31 } 31 }
32 32
33 private: 33 private:
34 PacketReceiverCallback packet_receiver_; 34 PacketReceiverCallback packet_receiver_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(LoopBackPacketPipe); 36 DISALLOW_COPY_AND_ASSIGN(LoopBackPacketPipe);
37 }; 37 };
38 38
39 } // namespace 39 } // namespace
40 40
41 LoopBackTransport::LoopBackTransport( 41 LoopBackTransport::LoopBackTransport(
42 scoped_refptr<CastEnvironment> cast_environment) 42 scoped_refptr<CastEnvironment> cast_environment)
43 : cast_environment_(cast_environment), 43 : cast_environment_(cast_environment),
44 bytes_sent_(0) { 44 bytes_sent_(0) {
45 } 45 }
46 46
47 LoopBackTransport::~LoopBackTransport() { 47 LoopBackTransport::~LoopBackTransport() {
48 } 48 }
49 49
50 bool LoopBackTransport::SendPacket(PacketRef packet, 50 bool LoopBackTransport::SendPacket(PacketRef packet,
51 const base::Closure& cb) { 51 const base::Closure& cb) {
52 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 52 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
53 scoped_ptr<Packet> packet_copy(new Packet(packet->data)); 53 std::unique_ptr<Packet> packet_copy(new Packet(packet->data));
54 packet_pipe_->Send(std::move(packet_copy)); 54 packet_pipe_->Send(std::move(packet_copy));
55 bytes_sent_ += packet->data.size(); 55 bytes_sent_ += packet->data.size();
56 return true; 56 return true;
57 } 57 }
58 58
59 int64_t LoopBackTransport::GetBytesSent() { 59 int64_t LoopBackTransport::GetBytesSent() {
60 return bytes_sent_; 60 return bytes_sent_;
61 } 61 }
62 62
63 void LoopBackTransport::Initialize( 63 void LoopBackTransport::Initialize(
64 scoped_ptr<test::PacketPipe> pipe, 64 std::unique_ptr<test::PacketPipe> pipe,
65 const PacketReceiverCallback& packet_receiver, 65 const PacketReceiverCallback& packet_receiver,
66 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 66 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
67 base::TickClock* clock) { 67 base::TickClock* clock) {
68 scoped_ptr<test::PacketPipe> loopback_pipe( 68 std::unique_ptr<test::PacketPipe> loopback_pipe(
69 new LoopBackPacketPipe(packet_receiver)); 69 new LoopBackPacketPipe(packet_receiver));
70 if (pipe) { 70 if (pipe) {
71 // Append the loopback pipe to the end. 71 // Append the loopback pipe to the end.
72 pipe->AppendToPipe(std::move(loopback_pipe)); 72 pipe->AppendToPipe(std::move(loopback_pipe));
73 packet_pipe_ = std::move(pipe); 73 packet_pipe_ = std::move(pipe);
74 } else { 74 } else {
75 packet_pipe_ = std::move(loopback_pipe); 75 packet_pipe_ = std::move(loopback_pipe);
76 } 76 }
77 packet_pipe_->InitOnIOThread(task_runner, clock); 77 packet_pipe_->InitOnIOThread(task_runner, clock);
78 } 78 }
79 79
80 } // namespace cast 80 } // namespace cast
81 } // namespace media 81 } // namespace media
OLDNEW
« 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