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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/socket_test_util.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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 | « net/socket/socket_libevent.h ('k') | net/socket/socks5_client_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_test_util.h
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 50d28ecf0564f3c87d3a86bb74da4e8af5a5bf3b..1496aec2ebed3c3f98cbd34515d8a1e7964334d4 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -262,9 +262,9 @@ class StaticSocketDataProvider : public SocketDataProvider {
virtual void CompleteRead() {}
// SocketDataProvider implementation.
- virtual MockRead GetNextRead() OVERRIDE;
- virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
- virtual void Reset() OVERRIDE;
+ virtual MockRead GetNextRead() override;
+ virtual MockWriteResult OnWrite(const std::string& data) override;
+ virtual void Reset() override;
private:
MockRead* reads_;
@@ -292,9 +292,9 @@ class DynamicSocketDataProvider : public SocketDataProvider {
void allow_unconsumed_reads(bool allow) { allow_unconsumed_reads_ = allow; }
// SocketDataProvider implementation.
- virtual MockRead GetNextRead() OVERRIDE;
+ virtual MockRead GetNextRead() override;
virtual MockWriteResult OnWrite(const std::string& data) = 0;
- virtual void Reset() OVERRIDE;
+ virtual void Reset() override;
protected:
// The next time there is a read from this socket, it will return |data|.
@@ -376,10 +376,10 @@ class DelayedSocketData : public StaticSocketDataProvider {
void ForceNextRead();
// StaticSocketDataProvider:
- virtual MockRead GetNextRead() OVERRIDE;
- virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
- virtual void Reset() OVERRIDE;
- virtual void CompleteRead() OVERRIDE;
+ virtual MockRead GetNextRead() override;
+ virtual MockWriteResult OnWrite(const std::string& data) override;
+ virtual void Reset() override;
+ virtual void CompleteRead() override;
private:
int write_delay_;
@@ -430,10 +430,10 @@ class OrderedSocketData : public StaticSocketDataProvider {
void EndLoop();
// StaticSocketDataProvider:
- virtual MockRead GetNextRead() OVERRIDE;
- virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
- virtual void Reset() OVERRIDE;
- virtual void CompleteRead() OVERRIDE;
+ virtual MockRead GetNextRead() override;
+ virtual MockWriteResult OnWrite(const std::string& data) override;
+ virtual void Reset() override;
+ virtual void CompleteRead() override;
private:
int sequence_number_;
@@ -560,14 +560,14 @@ class DeterministicSocketData : public StaticSocketDataProvider {
// When the socket calls Read(), that calls GetNextRead(), and expects either
// ERR_IO_PENDING or data.
- virtual MockRead GetNextRead() OVERRIDE;
+ virtual MockRead GetNextRead() override;
// When the socket calls Write(), it always completes synchronously. OnWrite()
// checks to make sure the written data matches the expected data. The
// callback will not be invoked until its sequence number is reached.
- virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
- virtual void Reset() OVERRIDE;
- virtual void CompleteRead() OVERRIDE {}
+ virtual MockWriteResult OnWrite(const std::string& data) override;
+ virtual void Reset() override;
+ virtual void CompleteRead() override {}
private:
// Invoke the read and write callbacks, if the timing is appropriate.
@@ -654,17 +654,17 @@ class MockClientSocketFactory : public ClientSocketFactory {
DatagramSocket::BindType bind_type,
const RandIntCallback& rand_int_cb,
NetLog* net_log,
- const NetLog::Source& source) OVERRIDE;
+ const NetLog::Source& source) override;
virtual scoped_ptr<StreamSocket> CreateTransportClientSocket(
const AddressList& addresses,
NetLog* net_log,
- const NetLog::Source& source) OVERRIDE;
+ const NetLog::Source& source) override;
virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket(
scoped_ptr<ClientSocketHandle> transport_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
- const SSLClientSocketContext& context) OVERRIDE;
- virtual void ClearSSLSessionCache() OVERRIDE;
+ const SSLClientSocketContext& context) override;
+ virtual void ClearSSLSessionCache() override;
private:
SocketDataProviderArray<SocketDataProvider> mock_data_;
@@ -688,34 +688,34 @@ class MockClientSocket : public SSLClientSocket {
virtual int Write(IOBuffer* buf,
int buf_len,
const CompletionCallback& callback) = 0;
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
- virtual int SetSendBufferSize(int32 size) OVERRIDE;
+ virtual int SetReceiveBufferSize(int32 size) override;
+ virtual int SetSendBufferSize(int32 size) override;
// StreamSocket implementation.
virtual int Connect(const CompletionCallback& callback) = 0;
- virtual void Disconnect() OVERRIDE;
- virtual bool IsConnected() const OVERRIDE;
- virtual bool IsConnectedAndIdle() const OVERRIDE;
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
- virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
- virtual const BoundNetLog& NetLog() const OVERRIDE;
- virtual void SetSubresourceSpeculation() OVERRIDE {}
- virtual void SetOmniboxSpeculation() OVERRIDE {}
+ virtual void Disconnect() override;
+ virtual bool IsConnected() const override;
+ virtual bool IsConnectedAndIdle() const override;
+ virtual int GetPeerAddress(IPEndPoint* address) const override;
+ virtual int GetLocalAddress(IPEndPoint* address) const override;
+ virtual const BoundNetLog& NetLog() const override;
+ virtual void SetSubresourceSpeculation() override {}
+ virtual void SetOmniboxSpeculation() override {}
// SSLClientSocket implementation.
- virtual std::string GetSessionCacheKey() const OVERRIDE;
- virtual bool InSessionCache() const OVERRIDE;
- virtual void SetHandshakeCompletionCallback(const base::Closure& cb) OVERRIDE;
+ virtual std::string GetSessionCacheKey() const override;
+ virtual bool InSessionCache() const override;
+ virtual void SetHandshakeCompletionCallback(const base::Closure& cb) override;
virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
- OVERRIDE;
+ override;
virtual int ExportKeyingMaterial(const base::StringPiece& label,
bool has_context,
const base::StringPiece& context,
unsigned char* out,
- unsigned int outlen) OVERRIDE;
- virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
- virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
- virtual ChannelIDService* GetChannelIDService() const OVERRIDE;
+ unsigned int outlen) override;
+ virtual int GetTLSUniqueChannelBinding(std::string* out) override;
+ virtual NextProtoStatus GetNextProto(std::string* proto) override;
+ virtual ChannelIDService* GetChannelIDService() const override;
protected:
virtual ~MockClientSocket();
@@ -724,7 +724,7 @@ class MockClientSocket : public SSLClientSocket {
// SSLClientSocket implementation.
virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain()
- const OVERRIDE;
+ const override;
// True if Connect completed successfully and Disconnect hasn't been called.
bool connected_;
@@ -752,25 +752,25 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {
// Socket implementation.
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
// StreamSocket implementation.
- virtual int Connect(const CompletionCallback& callback) OVERRIDE;
- virtual void Disconnect() OVERRIDE;
- virtual bool IsConnected() const OVERRIDE;
- virtual bool IsConnectedAndIdle() const OVERRIDE;
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
- virtual bool WasEverUsed() const OVERRIDE;
- virtual bool UsingTCPFastOpen() const OVERRIDE;
- virtual bool WasNpnNegotiated() const OVERRIDE;
- virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
+ virtual int Connect(const CompletionCallback& callback) override;
+ virtual void Disconnect() override;
+ virtual bool IsConnected() const override;
+ virtual bool IsConnectedAndIdle() const override;
+ virtual int GetPeerAddress(IPEndPoint* address) const override;
+ virtual bool WasEverUsed() const override;
+ virtual bool UsingTCPFastOpen() const override;
+ virtual bool WasNpnNegotiated() const override;
+ virtual bool GetSSLInfo(SSLInfo* ssl_info) override;
// AsyncSocket:
- virtual void OnReadComplete(const MockRead& data) OVERRIDE;
- virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+ virtual void OnReadComplete(const MockRead& data) override;
+ virtual void OnConnectComplete(const MockConnect& data) override;
private:
int CompleteRead();
@@ -854,33 +854,33 @@ class DeterministicMockUDPClientSocket
virtual ~DeterministicMockUDPClientSocket();
// DeterministicSocketData::Delegate:
- virtual bool WritePending() const OVERRIDE;
- virtual bool ReadPending() const OVERRIDE;
- virtual void CompleteWrite() OVERRIDE;
- virtual int CompleteRead() OVERRIDE;
+ virtual bool WritePending() const override;
+ virtual bool ReadPending() const override;
+ virtual void CompleteWrite() override;
+ virtual int CompleteRead() override;
// Socket implementation.
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
- virtual int SetSendBufferSize(int32 size) OVERRIDE;
+ const CompletionCallback& callback) override;
+ virtual int SetReceiveBufferSize(int32 size) override;
+ virtual int SetSendBufferSize(int32 size) override;
// DatagramSocket implementation.
- virtual void Close() OVERRIDE;
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
- virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
- virtual const BoundNetLog& NetLog() const OVERRIDE;
+ virtual void Close() override;
+ virtual int GetPeerAddress(IPEndPoint* address) const override;
+ virtual int GetLocalAddress(IPEndPoint* address) const override;
+ virtual const BoundNetLog& NetLog() const override;
// DatagramClientSocket implementation.
- virtual int Connect(const IPEndPoint& address) OVERRIDE;
+ virtual int Connect(const IPEndPoint& address) override;
// AsyncSocket implementation.
- virtual void OnReadComplete(const MockRead& data) OVERRIDE;
- virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+ virtual void OnReadComplete(const MockRead& data) override;
+ virtual void OnConnectComplete(const MockConnect& data) override;
void set_source_port(int port) { source_port_ = port; }
@@ -905,32 +905,32 @@ class DeterministicMockTCPClientSocket
virtual ~DeterministicMockTCPClientSocket();
// DeterministicSocketData::Delegate:
- virtual bool WritePending() const OVERRIDE;
- virtual bool ReadPending() const OVERRIDE;
- virtual void CompleteWrite() OVERRIDE;
- virtual int CompleteRead() OVERRIDE;
+ virtual bool WritePending() const override;
+ virtual bool ReadPending() const override;
+ virtual void CompleteWrite() override;
+ virtual int CompleteRead() override;
// Socket:
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
// StreamSocket:
- virtual int Connect(const CompletionCallback& callback) OVERRIDE;
- virtual void Disconnect() OVERRIDE;
- virtual bool IsConnected() const OVERRIDE;
- virtual bool IsConnectedAndIdle() const OVERRIDE;
- virtual bool WasEverUsed() const OVERRIDE;
- virtual bool UsingTCPFastOpen() const OVERRIDE;
- virtual bool WasNpnNegotiated() const OVERRIDE;
- virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
+ virtual int Connect(const CompletionCallback& callback) override;
+ virtual void Disconnect() override;
+ virtual bool IsConnected() const override;
+ virtual bool IsConnectedAndIdle() const override;
+ virtual bool WasEverUsed() const override;
+ virtual bool UsingTCPFastOpen() const override;
+ virtual bool WasNpnNegotiated() const override;
+ virtual bool GetSSLInfo(SSLInfo* ssl_info) override;
// AsyncSocket:
- virtual void OnReadComplete(const MockRead& data) OVERRIDE;
- virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+ virtual void OnReadComplete(const MockRead& data) override;
+ virtual void OnConnectComplete(const MockConnect& data) override;
private:
DeterministicSocketHelper helper_;
@@ -949,39 +949,39 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
// Socket implementation.
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
// StreamSocket implementation.
- virtual int Connect(const CompletionCallback& callback) OVERRIDE;
- virtual void Disconnect() OVERRIDE;
- virtual bool IsConnected() const OVERRIDE;
- virtual bool WasEverUsed() const OVERRIDE;
- virtual bool UsingTCPFastOpen() const OVERRIDE;
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
- virtual bool WasNpnNegotiated() const OVERRIDE;
- virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
+ virtual int Connect(const CompletionCallback& callback) override;
+ virtual void Disconnect() override;
+ virtual bool IsConnected() const override;
+ virtual bool WasEverUsed() const override;
+ virtual bool UsingTCPFastOpen() const override;
+ virtual int GetPeerAddress(IPEndPoint* address) const override;
+ virtual bool WasNpnNegotiated() const override;
+ virtual bool GetSSLInfo(SSLInfo* ssl_info) override;
// SSLClientSocket implementation.
- virtual std::string GetSessionCacheKey() const OVERRIDE;
- virtual bool InSessionCache() const OVERRIDE;
- virtual void SetHandshakeCompletionCallback(const base::Closure& cb) OVERRIDE;
+ virtual std::string GetSessionCacheKey() const override;
+ virtual bool InSessionCache() const override;
+ virtual void SetHandshakeCompletionCallback(const base::Closure& cb) override;
virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
- OVERRIDE;
- virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
- virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;
- virtual void set_protocol_negotiated(NextProto protocol_negotiated) OVERRIDE;
- virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
+ override;
+ virtual NextProtoStatus GetNextProto(std::string* proto) override;
+ virtual bool set_was_npn_negotiated(bool negotiated) override;
+ virtual void set_protocol_negotiated(NextProto protocol_negotiated) override;
+ virtual NextProto GetNegotiatedProtocol() const override;
// This MockSocket does not implement the manual async IO feature.
- virtual void OnReadComplete(const MockRead& data) OVERRIDE;
- virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+ virtual void OnReadComplete(const MockRead& data) override;
+ virtual void OnConnectComplete(const MockConnect& data) override;
- virtual bool WasChannelIDSent() const OVERRIDE;
- virtual void set_channel_id_sent(bool channel_id_sent) OVERRIDE;
- virtual ChannelIDService* GetChannelIDService() const OVERRIDE;
+ virtual bool WasChannelIDSent() const override;
+ virtual void set_channel_id_sent(bool channel_id_sent) override;
+ virtual ChannelIDService* GetChannelIDService() const override;
bool reached_connect() const { return reached_connect_; }
@@ -1033,25 +1033,25 @@ class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket {
// Socket implementation.
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
- virtual int SetSendBufferSize(int32 size) OVERRIDE;
+ const CompletionCallback& callback) override;
+ virtual int SetReceiveBufferSize(int32 size) override;
+ virtual int SetSendBufferSize(int32 size) override;
// DatagramSocket implementation.
- virtual void Close() OVERRIDE;
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
- virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
- virtual const BoundNetLog& NetLog() const OVERRIDE;
+ virtual void Close() override;
+ virtual int GetPeerAddress(IPEndPoint* address) const override;
+ virtual int GetLocalAddress(IPEndPoint* address) const override;
+ virtual const BoundNetLog& NetLog() const override;
// DatagramClientSocket implementation.
- virtual int Connect(const IPEndPoint& address) OVERRIDE;
+ virtual int Connect(const IPEndPoint& address) override;
// AsyncSocket implementation.
- virtual void OnReadComplete(const MockRead& data) OVERRIDE;
- virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+ virtual void OnReadComplete(const MockRead& data) override;
+ virtual void OnConnectComplete(const MockConnect& data) override;
void set_source_port(int port) { source_port_ = port;}
@@ -1221,13 +1221,13 @@ class MockTransportClientSocketPool : public TransportClientSocketPool {
RequestPriority priority,
ClientSocketHandle* handle,
const CompletionCallback& callback,
- const BoundNetLog& net_log) OVERRIDE;
+ const BoundNetLog& net_log) override;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle) OVERRIDE;
+ ClientSocketHandle* handle) override;
virtual void ReleaseSocket(const std::string& group_name,
scoped_ptr<StreamSocket> socket,
- int id) OVERRIDE;
+ int id) override;
private:
ClientSocketFactory* client_socket_factory_;
@@ -1267,17 +1267,17 @@ class DeterministicMockClientSocketFactory : public ClientSocketFactory {
DatagramSocket::BindType bind_type,
const RandIntCallback& rand_int_cb,
NetLog* net_log,
- const NetLog::Source& source) OVERRIDE;
+ const NetLog::Source& source) override;
virtual scoped_ptr<StreamSocket> CreateTransportClientSocket(
const AddressList& addresses,
NetLog* net_log,
- const NetLog::Source& source) OVERRIDE;
+ const NetLog::Source& source) override;
virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket(
scoped_ptr<ClientSocketHandle> transport_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
- const SSLClientSocketContext& context) OVERRIDE;
- virtual void ClearSSLSessionCache() OVERRIDE;
+ const SSLClientSocketContext& context) override;
+ virtual void ClearSSLSessionCache() override;
private:
SocketDataProviderArray<DeterministicSocketData> mock_data_;
@@ -1306,13 +1306,13 @@ class MockSOCKSClientSocketPool : public SOCKSClientSocketPool {
RequestPriority priority,
ClientSocketHandle* handle,
const CompletionCallback& callback,
- const BoundNetLog& net_log) OVERRIDE;
+ const BoundNetLog& net_log) override;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle) OVERRIDE;
+ ClientSocketHandle* handle) override;
virtual void ReleaseSocket(const std::string& group_name,
scoped_ptr<StreamSocket> socket,
- int id) OVERRIDE;
+ int id) override;
private:
TransportClientSocketPool* const transport_pool_;
« no previous file with comments | « net/socket/socket_libevent.h ('k') | net/socket/socks5_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698