| Index: media/cast/test/utility/tap_proxy.cc
|
| diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc
|
| index 054687411174d737f13e986f42e8d1f9135ea0a2..eac758963ef8cef8a88670d0ad003b995faecd30 100644
|
| --- a/media/cast/test/utility/tap_proxy.cc
|
| +++ b/media/cast/test/utility/tap_proxy.cc
|
| @@ -41,7 +41,7 @@ class SendToFDPipe : public PacketPipe {
|
| public:
|
| explicit SendToFDPipe(int fd) : fd_(fd) {
|
| }
|
| - virtual void Send(scoped_ptr<Packet> packet) override {
|
| + void Send(scoped_ptr<Packet> packet) override {
|
| while (1) {
|
| int written = write(
|
| fd_,
|
| @@ -85,11 +85,10 @@ class QueueManager : public base::MessageLoopForIO::Watcher {
|
| &tick_clock_);
|
| }
|
|
|
| - virtual ~QueueManager() {
|
| - }
|
| + ~QueueManager() override {}
|
|
|
| // MessageLoopForIO::Watcher methods
|
| - virtual void OnFileCanReadWithoutBlocking(int fd) override {
|
| + void OnFileCanReadWithoutBlocking(int fd) override {
|
| scoped_ptr<Packet> packet(new Packet(kMaxPacketSize));
|
| int nread = read(input_fd_,
|
| reinterpret_cast<char*>(&packet->front()),
|
| @@ -103,9 +102,7 @@ class QueueManager : public base::MessageLoopForIO::Watcher {
|
| packet->resize(nread);
|
| packet_pipe_->Send(packet.Pass());
|
| }
|
| - virtual void OnFileCanWriteWithoutBlocking(int fd) override {
|
| - NOTREACHED();
|
| - }
|
| + void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
|
|
|
| private:
|
| int input_fd_;
|
| @@ -172,8 +169,7 @@ ByteCounter out_pipe_output_counter;
|
| class ByteCounterPipe : public media::cast::test::PacketPipe {
|
| public:
|
| ByteCounterPipe(ByteCounter* counter) : counter_(counter) {}
|
| - virtual void Send(scoped_ptr<media::cast::Packet> packet)
|
| - override {
|
| + void Send(scoped_ptr<media::cast::Packet> packet) override {
|
| counter_->Increment(packet->size());
|
| pipe_->Send(packet.Pass());
|
| }
|
|
|