Index: content/browser/renderer_host/p2p/socket_host_udp_unittest.cc |
diff --git a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc |
index 2220471d485e99b083a1e2eee5aa3efc162b0787..076c7529de2275099277ab0e0c101d1e42b1e9d0 100644 |
--- a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc |
+++ b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc |
@@ -29,7 +29,7 @@ namespace { |
class FakeTiming : public rtc::Timing { |
public: |
FakeTiming() : now_(0.0) {} |
- virtual double TimerNow() OVERRIDE { return now_; } |
+ virtual double TimerNow() override { return now_; } |
void set_now(double now) { now_ = now; } |
private: |
@@ -46,27 +46,27 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { |
: sent_packets_(sent_packets) { |
} |
- virtual void Close() OVERRIDE { |
+ virtual void Close() override { |
} |
- virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE { |
+ virtual int GetPeerAddress(net::IPEndPoint* address) const override { |
NOTREACHED(); |
return net::ERR_SOCKET_NOT_CONNECTED; |
} |
- virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE { |
+ virtual int GetLocalAddress(net::IPEndPoint* address) const override { |
*address = address_; |
return 0; |
} |
- virtual int Listen(const net::IPEndPoint& address) OVERRIDE { |
+ virtual int Listen(const net::IPEndPoint& address) override { |
address_ = address; |
return 0; |
} |
virtual int RecvFrom(net::IOBuffer* buf, int buf_len, |
net::IPEndPoint* address, |
- const net::CompletionCallback& callback) OVERRIDE { |
+ const net::CompletionCallback& callback) override { |
CHECK(recv_callback_.is_null()); |
if (incoming_packets_.size() > 0) { |
scoped_refptr<net::IOBuffer> buffer(buf); |
@@ -87,18 +87,18 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { |
virtual int SendTo(net::IOBuffer* buf, int buf_len, |
const net::IPEndPoint& address, |
- const net::CompletionCallback& callback) OVERRIDE { |
+ const net::CompletionCallback& callback) override { |
scoped_refptr<net::IOBuffer> buffer(buf); |
std::vector<char> data_vector(buffer->data(), buffer->data() + buf_len); |
sent_packets_->push_back(UDPPacket(address, data_vector)); |
return buf_len; |
} |
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE { |
+ virtual int SetReceiveBufferSize(int32 size) override { |
return net::OK; |
} |
- virtual int SetSendBufferSize(int32 size) OVERRIDE { |
+ virtual int SetSendBufferSize(int32 size) override { |
return net::OK; |
} |
@@ -116,51 +116,51 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket { |
} |
} |
- virtual const net::BoundNetLog& NetLog() const OVERRIDE { |
+ virtual const net::BoundNetLog& NetLog() const override { |
return net_log_; |
} |
- virtual void AllowAddressReuse() OVERRIDE { |
+ virtual void AllowAddressReuse() override { |
NOTIMPLEMENTED(); |
} |
- virtual void AllowBroadcast() OVERRIDE { |
+ virtual void AllowBroadcast() override { |
NOTIMPLEMENTED(); |
} |
virtual int JoinGroup( |
- const net::IPAddressNumber& group_address) const OVERRIDE { |
+ const net::IPAddressNumber& group_address) const override { |
NOTIMPLEMENTED(); |
return net::ERR_NOT_IMPLEMENTED; |
} |
virtual int LeaveGroup( |
- const net::IPAddressNumber& group_address) const OVERRIDE { |
+ const net::IPAddressNumber& group_address) const override { |
NOTIMPLEMENTED(); |
return net::ERR_NOT_IMPLEMENTED; |
} |
- virtual int SetMulticastInterface(uint32 interface_index) OVERRIDE { |
+ virtual int SetMulticastInterface(uint32 interface_index) override { |
NOTIMPLEMENTED(); |
return net::ERR_NOT_IMPLEMENTED; |
} |
- virtual int SetMulticastTimeToLive(int time_to_live) OVERRIDE { |
+ virtual int SetMulticastTimeToLive(int time_to_live) override { |
NOTIMPLEMENTED(); |
return net::ERR_NOT_IMPLEMENTED; |
} |
- virtual int SetMulticastLoopbackMode(bool loopback) OVERRIDE { |
+ virtual int SetMulticastLoopbackMode(bool loopback) override { |
NOTIMPLEMENTED(); |
return net::ERR_NOT_IMPLEMENTED; |
} |
- virtual int SetDiffServCodePoint(net::DiffServCodePoint dscp) OVERRIDE { |
+ virtual int SetDiffServCodePoint(net::DiffServCodePoint dscp) override { |
NOTIMPLEMENTED(); |
return net::ERR_NOT_IMPLEMENTED; |
} |
- virtual void DetachFromThread() OVERRIDE { |
+ virtual void DetachFromThread() override { |
NOTIMPLEMENTED(); |
} |
@@ -182,7 +182,7 @@ namespace content { |
class P2PSocketHostUdpTest : public testing::Test { |
protected: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
EXPECT_CALL(sender_, Send( |
MatchMessage(static_cast<uint32>(P2PMsg_OnSocketCreated::ID)))) |
.WillOnce(DoAll(DeleteArg<0>(), Return(true))); |