Index: media/cast/test/utility/udp_proxy.cc |
diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc |
index a7708340a567c0f64cc9c15da878aea4de81241a..237c1e7cd8fd7112511b6af01c5d86339f6aaa85 100644 |
--- a/media/cast/test/utility/udp_proxy.cc |
+++ b/media/cast/test/utility/udp_proxy.cc |
@@ -56,7 +56,7 @@ class Buffer : public PacketPipe { |
CHECK_GT(max_megabits_per_second, 0); |
} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
if (packet->size() + buffer_size_ <= max_buffer_size_) { |
buffer_size_ += packet->size(); |
buffer_.push_back(linked_ptr<Packet>(packet.release())); |
@@ -116,7 +116,7 @@ class RandomDrop : public PacketPipe { |
RandomDrop(double drop_fraction) |
: drop_fraction_(static_cast<int>(drop_fraction * RAND_MAX)) {} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
if (rand() > drop_fraction_) { |
pipe_->Send(packet.Pass()); |
} |
@@ -133,9 +133,9 @@ scoped_ptr<PacketPipe> NewRandomDrop(double drop_fraction) { |
class SimpleDelayBase : public PacketPipe { |
public: |
SimpleDelayBase() : weak_factory_(this) {} |
- virtual ~SimpleDelayBase() {} |
+ ~SimpleDelayBase() override {} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
double seconds = GetDelay(); |
task_runner_->PostDelayedTask( |
FROM_HERE, |
@@ -158,9 +158,7 @@ class SimpleDelayBase : public PacketPipe { |
class ConstantDelay : public SimpleDelayBase { |
public: |
ConstantDelay(double delay_seconds) : delay_seconds_(delay_seconds) {} |
- virtual double GetDelay() override { |
- return delay_seconds_; |
- } |
+ double GetDelay() override { return delay_seconds_; } |
private: |
double delay_seconds_; |
@@ -174,9 +172,7 @@ class RandomUnsortedDelay : public SimpleDelayBase { |
public: |
RandomUnsortedDelay(double random_delay) : random_delay_(random_delay) {} |
- virtual double GetDelay() override { |
- return random_delay_ * base::RandDouble(); |
- } |
+ double GetDelay() override { return random_delay_ * base::RandDouble(); } |
private: |
double random_delay_; |
@@ -193,11 +189,11 @@ class DuplicateAndDelay : public RandomUnsortedDelay { |
RandomUnsortedDelay(random_delay), |
delay_min_(delay_min) { |
} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
pipe_->Send(scoped_ptr<Packet>(new Packet(*packet.get()))); |
RandomUnsortedDelay::Send(packet.Pass()); |
} |
- virtual double GetDelay() override { |
+ double GetDelay() override { |
return RandomUnsortedDelay::GetDelay() + delay_min_; |
} |
private: |
@@ -220,7 +216,7 @@ class RandomSortedDelay : public PacketPipe { |
seconds_between_extra_delay_(seconds_between_extra_delay), |
weak_factory_(this) {} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
buffer_.push_back(linked_ptr<Packet>(packet.release())); |
if (buffer_.size() == 1) { |
next_send_ = std::max( |
@@ -230,7 +226,7 @@ class RandomSortedDelay : public PacketPipe { |
ProcessBuffer(); |
} |
} |
- virtual void InitOnIOThread( |
+ void InitOnIOThread( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
base::TickClock* clock) override { |
PacketPipe::InitOnIOThread(task_runner, clock); |
@@ -309,14 +305,14 @@ class NetworkGlitchPipe : public PacketPipe { |
max_outage_time_(average_outage_time * 2), |
weak_factory_(this) {} |
- virtual void InitOnIOThread( |
+ void InitOnIOThread( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
base::TickClock* clock) override { |
PacketPipe::InitOnIOThread(task_runner, clock); |
Flip(); |
} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
if (works_) { |
pipe_->Send(packet.Pass()); |
} |
@@ -360,7 +356,7 @@ class InterruptedPoissonProcess::InternalBuffer : public PacketPipe { |
weak_factory_(this) { |
} |
- virtual void Send(scoped_ptr<Packet> packet) override { |
+ void Send(scoped_ptr<Packet> packet) override { |
// Drop if buffer is full. |
if (stored_size_ >= stored_limit_) |
return; |
@@ -370,7 +366,7 @@ class InterruptedPoissonProcess::InternalBuffer : public PacketPipe { |
DCHECK(buffer_.size() == buffer_time_.size()); |
} |
- virtual void InitOnIOThread( |
+ void InitOnIOThread( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
base::TickClock* clock) override { |
clock_ = clock; |
@@ -552,10 +548,8 @@ class PacketSender : public PacketPipe { |
public: |
PacketSender(UDPProxyImpl* udp_proxy, const net::IPEndPoint* destination) |
: udp_proxy_(udp_proxy), destination_(destination) {} |
- virtual void Send(scoped_ptr<Packet> packet) override; |
- virtual void AppendToPipe(scoped_ptr<PacketPipe> pipe) override { |
- NOTREACHED(); |
- } |
+ void Send(scoped_ptr<Packet> packet) override; |
+ void AppendToPipe(scoped_ptr<PacketPipe> pipe) override { NOTREACHED(); } |
private: |
UDPProxyImpl* udp_proxy_; |
@@ -662,7 +656,7 @@ class UDPProxyImpl : public UDPProxy { |
start_event.Wait(); |
} |
- virtual ~UDPProxyImpl() { |
+ ~UDPProxyImpl() override { |
base::WaitableEvent stop_event(false, false); |
proxy_thread_.message_loop_proxy()->PostTask( |
FROM_HERE, |