From f2cbbc822ae7e9268d724463c309374102891912 Mon Sep 17 00:00:00 2001
From: "avi@chromium.org"
<avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 16 Nov 2011 01:10:29 +0000
Subject: Add OVERRIDE to net/.
BUG=104314
Review URL: http://codereview.chromium.org/8568021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110231 0039d316-1c4b-4281-b951-d872f2087c98
---
net/socket/client_socket_pool_base.h | 4 +-
net/socket/client_socket_pool_manager.h | 4 +-
net/socket/socket_test_util.h | 188 +++++++++++++++---------------
net/socket/socks5_client_socket.h | 42 ++++---
net/socket/socks_client_socket.h | 42 ++++---
net/socket/socks_client_socket_pool.h | 36 +++---
net/socket/ssl_client_socket_mac.h | 47 ++++----
net/socket/ssl_client_socket_nss.h | 47 ++++----
net/socket/ssl_client_socket_pool.h | 42 ++++---
net/socket/ssl_error_params.h | 4 +-
net/socket/ssl_server_socket_nss.h | 38 +++---
net/socket/tcp_client_socket_libevent.h | 46 ++++----
net/socket/tcp_server_socket_libevent.h | 10 +-
net/socket/transport_client_socket_pool.h | 36 +++---
14 files changed, 308 insertions(+), 278 deletions(-)
(limited to 'net/socket')
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index 9e46e5e..bc098f7 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -311,10 +311,10 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
void EnableConnectBackupJobs();
// ConnectJob::Delegate methods:
- virtual void OnConnectJobComplete(int result, ConnectJob* job);
+ virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE;
// NetworkChangeNotifier::IPAddressObserver methods:
- virtual void OnIPAddressChanged();
+ virtual void OnIPAddressChanged() OVERRIDE;
private:
friend class base::RefCounted<ClientSocketPoolBaseHelper>;
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
index 4829550..1b81781 100644
--- a/net/socket/client_socket_pool_manager.h
+++ b/net/socket/client_socket_pool_manager.h
@@ -172,8 +172,8 @@ class ClientSocketPoolManager : public base::NonThreadSafe,
base::Value* SocketPoolInfoToValue() const;
// CertDatabase::Observer methods:
- virtual void OnUserCertAdded(const X509Certificate* cert);
- virtual void OnCertTrustChanged(const X509Certificate* cert);
+ virtual void OnUserCertAdded(const X509Certificate* cert) OVERRIDE;
+ virtual void OnCertTrustChanged(const X509Certificate* cert) OVERRIDE;
private:
friend class HttpNetworkSessionPeer;
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index cc90516..e1d2b2a 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -199,9 +199,9 @@ class StaticSocketDataProvider : public SocketDataProvider {
virtual void CompleteRead() {}
// SocketDataProvider methods:
- virtual MockRead GetNextRead();
- virtual MockWriteResult OnWrite(const std::string& data);
- virtual void Reset();
+ virtual MockRead GetNextRead() OVERRIDE;
+ virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
+ virtual void Reset() OVERRIDE;
private:
MockRead* reads_;
@@ -229,9 +229,9 @@ class DynamicSocketDataProvider : public SocketDataProvider {
void allow_unconsumed_reads(bool allow) { allow_unconsumed_reads_ = allow; }
// SocketDataProvider methods:
- virtual MockRead GetNextRead();
+ virtual MockRead GetNextRead() OVERRIDE;
virtual MockWriteResult OnWrite(const std::string& data) = 0;
- virtual void Reset();
+ virtual void Reset() OVERRIDE;
protected:
// The next time there is a read from this socket, it will return |data|.
@@ -301,10 +301,10 @@ class DelayedSocketData : public StaticSocketDataProvider,
void ForceNextRead();
// StaticSocketDataProvider:
- virtual MockRead GetNextRead();
- virtual MockWriteResult OnWrite(const std::string& data);
- virtual void Reset();
- virtual void CompleteRead();
+ virtual MockRead GetNextRead() OVERRIDE;
+ virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
+ virtual void Reset() OVERRIDE;
+ virtual void CompleteRead() OVERRIDE;
private:
int write_delay_;
@@ -351,10 +351,10 @@ class OrderedSocketData : public StaticSocketDataProvider,
void EndLoop();
// StaticSocketDataProvider:
- virtual MockRead GetNextRead();
- virtual MockWriteResult OnWrite(const std::string& data);
- virtual void Reset();
- virtual void CompleteRead();
+ virtual MockRead GetNextRead() OVERRIDE;
+ virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
+ virtual void Reset() OVERRIDE;
+ virtual void CompleteRead() OVERRIDE;
private:
friend class base::RefCounted<OrderedSocketData>;
@@ -459,14 +459,14 @@ class DeterministicSocketData : public StaticSocketDataProvider,
// When the socket calls Read(), that calls GetNextRead(), and expects either
// ERR_IO_PENDING or data.
- virtual MockRead GetNextRead();
+ 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);
- virtual void Reset();
- virtual void CompleteRead() {}
+ 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.
@@ -556,18 +556,18 @@ class MockClientSocketFactory : public ClientSocketFactory {
DatagramSocket::BindType bind_type,
const RandIntCallback& rand_int_cb,
NetLog* net_log,
- const NetLog::Source& source);
+ const NetLog::Source& source) OVERRIDE;
virtual StreamSocket* CreateTransportClientSocket(
const AddressList& addresses,
NetLog* net_log,
- const NetLog::Source& source);
+ const NetLog::Source& source) OVERRIDE;
virtual SSLClientSocket* CreateSSLClientSocket(
ClientSocketHandle* transport_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
SSLHostInfo* ssl_host_info,
- const SSLClientSocketContext& context);
- virtual void ClearSSLSessionCache();
+ const SSLClientSocketContext& context) OVERRIDE;
+ virtual void ClearSSLSessionCache() OVERRIDE;
private:
SocketDataProviderArray<SocketDataProvider> mock_data_;
@@ -588,29 +588,29 @@ class MockClientSocket : public net::SSLClientSocket {
net::OldCompletionCallback* callback) = 0;
virtual int Write(net::IOBuffer* buf, int buf_len,
net::OldCompletionCallback* callback) = 0;
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
// StreamSocket methods:
virtual int Connect(net::OldCompletionCallback* callback) = 0;
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation() {}
- virtual void SetOmniboxSpeculation() {}
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* 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 methods:
- virtual void GetSSLInfo(net::SSLInfo* ssl_info);
+ virtual void GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
virtual void GetSSLCertRequestInfo(
- net::SSLCertRequestInfo* cert_request_info);
+ net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
virtual int ExportKeyingMaterial(const base::StringPiece& label,
const base::StringPiece& context,
unsigned char *out,
- unsigned int outlen);
- virtual NextProtoStatus GetNextProto(std::string* proto);
+ unsigned int outlen) OVERRIDE;
+ virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
protected:
virtual ~MockClientSocket();
@@ -634,23 +634,23 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {
// Socket methods:
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
// StreamSocket methods:
- virtual int Connect(net::OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
+ virtual bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// AsyncSocket:
- virtual void OnReadComplete(const MockRead& data);
+ virtual void OnReadComplete(const MockRead& data) OVERRIDE;
private:
int CompleteRead();
@@ -691,22 +691,22 @@ class DeterministicMockTCPClientSocket : public MockClientSocket,
// Socket:
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
// StreamSocket:
- virtual int Connect(net::OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(net::OldCompletionCallback* 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 int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// AsyncSocket:
- virtual void OnReadComplete(const MockRead& data);
+ virtual void OnReadComplete(const MockRead& data) OVERRIDE;
private:
bool write_pending_;
@@ -735,29 +735,29 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
// Socket methods:
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
// StreamSocket methods:
- virtual int Connect(net::OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// SSLClientSocket methods:
- virtual void GetSSLInfo(net::SSLInfo* ssl_info);
+ virtual void GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
virtual void GetSSLCertRequestInfo(
- net::SSLCertRequestInfo* cert_request_info);
- virtual NextProtoStatus GetNextProto(std::string* proto);
- virtual bool was_npn_negotiated() const;
- virtual bool set_was_npn_negotiated(bool negotiated);
+ net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
+ virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
+ virtual bool was_npn_negotiated() const OVERRIDE;
+ virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;
// This MockSocket does not implement the manual async IO feature.
- virtual void OnReadComplete(const MockRead& data);
+ virtual void OnReadComplete(const MockRead& data) OVERRIDE;
private:
class ConnectCallback;
@@ -777,23 +777,23 @@ class MockUDPClientSocket : public DatagramClientSocket,
// Socket interface
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
+ net::OldCompletionCallback* callback) OVERRIDE;
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ net::OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
// DatagramSocket interface
- virtual void Close();
- virtual int GetPeerAddress(IPEndPoint* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
+ 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 interface
- virtual int Connect(const IPEndPoint& address);
+ virtual int Connect(const IPEndPoint& address) OVERRIDE;
// AsyncSocket interface
- virtual void OnReadComplete(const MockRead& data);
+ virtual void OnReadComplete(const MockRead& data) OVERRIDE;
private:
int CompleteRead();
@@ -829,7 +829,7 @@ class TestSocketRequest : public CallbackRunner< Tuple1<int> > {
ClientSocketHandle* handle() { return &handle_; }
int WaitForResult();
- virtual void RunWithParams(const Tuple1<int>& params);
+ virtual void RunWithParams(const Tuple1<int>& params) OVERRIDE;
private:
ClientSocketHandle handle_;
@@ -933,12 +933,12 @@ class MockTransportClientSocketPool : public TransportClientSocketPool {
RequestPriority priority,
ClientSocketHandle* handle,
OldCompletionCallback* callback,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle);
+ ClientSocketHandle* handle) OVERRIDE;
virtual void ReleaseSocket(const std::string& group_name,
- StreamSocket* socket, int id);
+ StreamSocket* socket, int id) OVERRIDE;
private:
ClientSocketFactory* client_socket_factory_;
@@ -974,18 +974,18 @@ class DeterministicMockClientSocketFactory : public ClientSocketFactory {
DatagramSocket::BindType bind_type,
const RandIntCallback& rand_int_cb,
NetLog* net_log,
- const NetLog::Source& source);
+ const NetLog::Source& source) OVERRIDE;
virtual StreamSocket* CreateTransportClientSocket(
const AddressList& addresses,
NetLog* net_log,
- const NetLog::Source& source);
+ const NetLog::Source& source) OVERRIDE;
virtual SSLClientSocket* CreateSSLClientSocket(
ClientSocketHandle* transport_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
SSLHostInfo* ssl_host_info,
- const SSLClientSocketContext& context);
- virtual void ClearSSLSessionCache();
+ const SSLClientSocketContext& context) OVERRIDE;
+ virtual void ClearSSLSessionCache() OVERRIDE;
private:
SocketDataProviderArray<DeterministicSocketData> mock_data_;
@@ -1012,12 +1012,12 @@ class MockSOCKSClientSocketPool : public SOCKSClientSocketPool {
RequestPriority priority,
ClientSocketHandle* handle,
OldCompletionCallback* callback,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle);
+ ClientSocketHandle* handle) OVERRIDE;
virtual void ReleaseSocket(const std::string& group_name,
- StreamSocket* socket, int id);
+ StreamSocket* socket, int id) OVERRIDE;
private:
TransportClientSocketPool* const transport_pool_;
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index 03b17f2..aeb1864 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -51,27 +51,31 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
// StreamSocket methods:
// Does the SOCKS handshake and completes the protocol.
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual const BoundNetLog& NetLog() const OVERRIDE;
+ virtual void SetSubresourceSpeculation() OVERRIDE;
+ virtual void SetOmniboxSpeculation() OVERRIDE;
+ virtual bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
-
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
-
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+
+ virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
+ virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
private:
enum State {
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index 442db90..eb74a5e 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -48,27 +48,31 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
// StreamSocket methods:
// Does the SOCKS handshake and completes the protocol.
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual const BoundNetLog& NetLog() const OVERRIDE;
+ virtual void SetSubresourceSpeculation() OVERRIDE;
+ virtual void SetOmniboxSpeculation() OVERRIDE;
+ virtual bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
-
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
-
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+
+ virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
+ virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
private:
FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, CompleteHandshake);
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
index 741e0a3..34352b48 100644
--- a/net/socket/socks_client_socket_pool.h
+++ b/net/socket/socks_client_socket_pool.h
@@ -67,7 +67,7 @@ class SOCKSConnectJob : public ConnectJob {
virtual ~SOCKSConnectJob();
// ConnectJob methods.
- virtual LoadState GetLoadState() const;
+ virtual LoadState GetLoadState() const OVERRIDE;
private:
enum State {
@@ -91,7 +91,7 @@ class SOCKSConnectJob : public ConnectJob {
// Begins the transport connection and the SOCKS handshake. Returns OK on
// success and ERR_IO_PENDING if it cannot immediately service the request.
// Otherwise, it returns a net error code.
- virtual int ConnectInternal();
+ virtual int ConnectInternal() OVERRIDE;
scoped_refptr<SOCKSSocketParams> socks_params_;
TransportClientSocketPool* const transport_pool_;
@@ -123,39 +123,41 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
RequestPriority priority,
ClientSocketHandle* handle,
OldCompletionCallback* callback,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void RequestSockets(const std::string& group_name,
const void* params,
int num_sockets,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle);
+ ClientSocketHandle* handle) OVERRIDE;
virtual void ReleaseSocket(const std::string& group_name,
StreamSocket* socket,
- int id);
+ int id) OVERRIDE;
- virtual void Flush();
+ virtual void Flush() OVERRIDE;
- virtual void CloseIdleSockets();
+ virtual void CloseIdleSockets() OVERRIDE;
- virtual int IdleSocketCount() const;
+ virtual int IdleSocketCount() const OVERRIDE;
- virtual int IdleSocketCountInGroup(const std::string& group_name) const;
+ virtual int IdleSocketCountInGroup(
+ const std::string& group_name) const OVERRIDE;
- virtual LoadState GetLoadState(const std::string& group_name,
- const ClientSocketHandle* handle) const;
+ virtual LoadState GetLoadState(
+ const std::string& group_name,
+ const ClientSocketHandle* handle) const OVERRIDE;
virtual base::DictionaryValue* GetInfoAsValue(
const std::string& name,
const std::string& type,
- bool include_nested_pools) const;
+ bool include_nested_pools) const OVERRIDE;
- virtual base::TimeDelta ConnectionTimeout() const;
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
- virtual ClientSocketPoolHistograms* histograms() const;
+ virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
private:
typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase;
@@ -175,9 +177,9 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
virtual ConnectJob* NewConnectJob(
const std::string& group_name,
const PoolBase::Request& request,
- ConnectJob::Delegate* delegate) const;
+ ConnectJob::Delegate* delegate) const OVERRIDE;
- virtual base::TimeDelta ConnectionTimeout() const;
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
private:
TransportClientSocketPool* const transport_pool_;
diff --git a/net/socket/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h
index 5370b2d..febf072 100644
--- a/net/socket/ssl_client_socket_mac.h
+++ b/net/socket/ssl_client_socket_mac.h
@@ -41,34 +41,39 @@ class SSLClientSocketMac : public SSLClientSocket {
virtual ~SSLClientSocketMac();
// SSLClientSocket methods:
- virtual void GetSSLInfo(SSLInfo* ssl_info);
- virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
+ virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
+ virtual void GetSSLCertRequestInfo(
+ SSLCertRequestInfo* cert_request_info) OVERRIDE;
virtual int ExportKeyingMaterial(const base::StringPiece& label,
const base::StringPiece& context,
unsigned char *out,
- unsigned int outlen);
- virtual NextProtoStatus GetNextProto(std::string* proto);
+ unsigned int outlen) OVERRIDE;
+ virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
// StreamSocket methods:
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* 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 bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
private:
bool completed_handshake() const {
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 648e249..f7def8c 100644
--- a/net/socket/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -60,34 +60,39 @@ class SSLClientSocketNSS : public SSLClientSocket {
static void ClearSessionCache();
// SSLClientSocket methods:
- virtual void GetSSLInfo(SSLInfo* ssl_info);
- virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
+ virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
+ virtual void GetSSLCertRequestInfo(
+ SSLCertRequestInfo* cert_request_info) OVERRIDE;
virtual int ExportKeyingMaterial(const base::StringPiece& label,
const base::StringPiece& context,
unsigned char *out,
- unsigned int outlen);
- virtual NextProtoStatus GetNextProto(std::string* proto);
+ unsigned int outlen) OVERRIDE;
+ virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
// StreamSocket methods:
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* 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 bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
private:
enum State {
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index 2437a55..3305a6f 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -106,9 +106,9 @@ class SSLConnectJob : public ConnectJob {
virtual ~SSLConnectJob();
// ConnectJob methods.
- virtual LoadState GetLoadState() const;
+ virtual LoadState GetLoadState() const OVERRIDE;
- virtual void GetAdditionalErrorState(ClientSocketHandle * handle);
+ virtual void GetAdditionalErrorState(ClientSocketHandle * handle) OVERRIDE;
private:
enum State {
@@ -140,7 +140,7 @@ class SSLConnectJob : public ConnectJob {
// Starts the SSL connection process. Returns OK on success and
// ERR_IO_PENDING if it cannot immediately service the request.
// Otherwise, it returns a net error code.
- virtual int ConnectInternal();
+ virtual int ConnectInternal() OVERRIDE;
scoped_refptr<SSLSocketParams> params_;
TransportClientSocketPool* const transport_pool_;
@@ -196,39 +196,41 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
RequestPriority priority,
ClientSocketHandle* handle,
OldCompletionCallback* callback,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void RequestSockets(const std::string& group_name,
const void* params,
int num_sockets,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle);
+ ClientSocketHandle* handle) OVERRIDE;
virtual void ReleaseSocket(const std::string& group_name,
StreamSocket* socket,
- int id);
+ int id) OVERRIDE;
- virtual void Flush();
+ virtual void Flush() OVERRIDE;
- virtual void CloseIdleSockets();
+ virtual void CloseIdleSockets() OVERRIDE;
- virtual int IdleSocketCount() const;
+ virtual int IdleSocketCount() const OVERRIDE;
- virtual int IdleSocketCountInGroup(const std::string& group_name) const;
+ virtual int IdleSocketCountInGroup(
+ const std::string& group_name) const OVERRIDE;
- virtual LoadState GetLoadState(const std::string& group_name,
- const ClientSocketHandle* handle) const;
+ virtual LoadState GetLoadState(
+ const std::string& group_name,
+ const ClientSocketHandle* handle) const OVERRIDE;
virtual base::DictionaryValue* GetInfoAsValue(
const std::string& name,
const std::string& type,
- bool include_nested_pools) const;
+ bool include_nested_pools) const OVERRIDE;
- virtual base::TimeDelta ConnectionTimeout() const;
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
- virtual ClientSocketPoolHistograms* histograms() const;
+ virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
private:
typedef ClientSocketPoolBase<SSLSocketParams> PoolBase;
@@ -237,7 +239,7 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
// When the user changes the SSL config, we flush all idle sockets so they
// won't get re-used.
- virtual void OnSSLConfigChanged();
+ virtual void OnSSLConfigChanged() OVERRIDE;
class SSLConnectJobFactory : public PoolBase::ConnectJobFactory {
public:
@@ -256,9 +258,11 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
virtual ConnectJob* NewConnectJob(
const std::string& group_name,
const PoolBase::Request& request,
- ConnectJob::Delegate* delegate) const;
+ ConnectJob::Delegate* delegate) const OVERRIDE;
- virtual base::TimeDelta ConnectionTimeout() const { return timeout_; }
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE {
+ return timeout_;
+ }
private:
TransportClientSocketPool* const transport_pool_;
diff --git a/net/socket/ssl_error_params.h b/net/socket/ssl_error_params.h
index c0d685a..434d8bc 100644
--- a/net/socket/ssl_error_params.h
+++ b/net/socket/ssl_error_params.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,7 +16,7 @@ class SSLErrorParams : public NetLog::EventParameters {
SSLErrorParams(int net_error, int ssl_lib_error);
virtual ~SSLErrorParams();
- virtual base::Value* ToValue() const;
+ virtual base::Value* ToValue() const OVERRIDE;
private:
const int net_error_;
diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h
index 980464d..0004c4a 100644
--- a/net/socket/ssl_server_socket_nss.h
+++ b/net/socket/ssl_server_socket_nss.h
@@ -32,34 +32,34 @@ class SSLServerSocketNSS : public SSLServerSocket {
virtual ~SSLServerSocketNSS();
// SSLServerSocket interface.
- virtual int Handshake(OldCompletionCallback* callback);
+ virtual int Handshake(OldCompletionCallback* callback) OVERRIDE;
virtual int ExportKeyingMaterial(const base::StringPiece& label,
const base::StringPiece& context,
unsigned char *out,
- unsigned int outlen);
+ unsigned int outlen) OVERRIDE;
// Socket interface (via StreamSocket).
virtual int Read(IOBuffer* buf, int buf_len,
- OldCompletionCallback* callback);
+ OldCompletionCallback* callback) OVERRIDE;
virtual int Write(IOBuffer* buf, int buf_len,
- OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
// StreamSocket interface.
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* 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 bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
private:
enum State {
diff --git a/net/socket/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h
index 3baf6c9..2a6b041 100644
--- a/net/socket/tcp_client_socket_libevent.h
+++ b/net/socket/tcp_client_socket_libevent.h
@@ -43,27 +43,31 @@ class NET_EXPORT_PRIVATE TCPClientSocketLibevent : public StreamSocket,
int Bind(const IPEndPoint& address);
// StreamSocket methods:
- virtual int Connect(OldCompletionCallback* callback);
- virtual void Disconnect();
- virtual bool IsConnected() const;
- virtual bool IsConnectedAndIdle() const;
- virtual int GetPeerAddress(AddressList* address) const;
- virtual int GetLocalAddress(IPEndPoint* address) const;
- virtual const BoundNetLog& NetLog() const;
- virtual void SetSubresourceSpeculation();
- virtual void SetOmniboxSpeculation();
- virtual bool WasEverUsed() const;
- virtual bool UsingTCPFastOpen() const;
- virtual int64 NumBytesRead() const;
- virtual base::TimeDelta GetConnectTimeMicros() const;
+ virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual bool IsConnectedAndIdle() const OVERRIDE;
+ virtual int GetPeerAddress(AddressList* 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 bool WasEverUsed() const OVERRIDE;
+ virtual bool UsingTCPFastOpen() const OVERRIDE;
+ virtual int64 NumBytesRead() const OVERRIDE;
+ virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
// Socket methods:
// Multiple outstanding requests are not supported.
// Full duplex mode (reading and writing at the same time) is supported
- virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
- virtual bool SetReceiveBufferSize(int32 size);
- virtual bool SetSendBufferSize(int32 size);
+ virtual int Read(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual int Write(IOBuffer* buf,
+ int buf_len,
+ OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
private:
// State machine for connecting the socket.
@@ -79,12 +83,12 @@ class NET_EXPORT_PRIVATE TCPClientSocketLibevent : public StreamSocket,
// MessageLoopForIO::Watcher methods
- virtual void OnFileCanReadWithoutBlocking(int /* fd */) {
+ virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE {
if (socket_->read_callback_)
socket_->DidCompleteRead();
}
- virtual void OnFileCanWriteWithoutBlocking(int /* fd */) {}
+ virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {}
private:
TCPClientSocketLibevent* const socket_;
@@ -98,9 +102,9 @@ class NET_EXPORT_PRIVATE TCPClientSocketLibevent : public StreamSocket,
// MessageLoopForIO::Watcher methods
- virtual void OnFileCanReadWithoutBlocking(int /* fd */) {}
+ virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE {}
- virtual void OnFileCanWriteWithoutBlocking(int /* fd */) {
+ virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {
if (socket_->waiting_connect()) {
socket_->DidCompleteConnect();
} else if (socket_->write_callback_) {
diff --git a/net/socket/tcp_server_socket_libevent.h b/net/socket/tcp_server_socket_libevent.h
index df846b2..1325d06 100644
--- a/net/socket/tcp_server_socket_libevent.h
+++ b/net/socket/tcp_server_socket_libevent.h
@@ -26,14 +26,14 @@ class NET_EXPORT_PRIVATE TCPServerSocketLibevent
virtual ~TCPServerSocketLibevent();
// net::ServerSocket implementation.
- virtual int Listen(const net::IPEndPoint& address, int backlog);
- virtual int GetLocalAddress(IPEndPoint* address) const;
+ virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE;
+ virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
virtual int Accept(scoped_ptr<StreamSocket>* socket,
- OldCompletionCallback* callback);
+ OldCompletionCallback* callback) OVERRIDE;
// MessageLoopForIO::Watcher implementation.
- virtual void OnFileCanReadWithoutBlocking(int fd);
- virtual void OnFileCanWriteWithoutBlocking(int fd);
+ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
+ virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
private:
int AcceptInternal(scoped_ptr<StreamSocket>* socket);
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h
index e343371b..055fae1 100644
--- a/net/socket/transport_client_socket_pool.h
+++ b/net/socket/transport_client_socket_pool.h
@@ -67,7 +67,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob {
virtual ~TransportConnectJob();
// ConnectJob methods.
- virtual LoadState GetLoadState() const;
+ virtual LoadState GetLoadState() const OVERRIDE;
// Makes |addrlist| start with an IPv4 address if |addrlist| contains any
// IPv4 address.
@@ -104,7 +104,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob {
// Begins the host resolution and the TCP connect. Returns OK on success
// and ERR_IO_PENDING if it cannot immediately service the request.
// Otherwise, it returns a net error code.
- virtual int ConnectInternal();
+ virtual int ConnectInternal() OVERRIDE;
scoped_refptr<TransportSocketParams> params_;
ClientSocketFactory* const client_socket_factory_;
@@ -149,39 +149,41 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool {
RequestPriority priority,
ClientSocketHandle* handle,
OldCompletionCallback* callback,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void RequestSockets(const std::string& group_name,
const void* params,
int num_sockets,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log) OVERRIDE;
virtual void CancelRequest(const std::string& group_name,
- ClientSocketHandle* handle);
+ ClientSocketHandle* handle) OVERRIDE;
virtual void ReleaseSocket(const std::string& group_name,
StreamSocket* socket,
- int id);
+ int id) OVERRIDE;
- virtual void Flush();
+ virtual void Flush() OVERRIDE;
- virtual void CloseIdleSockets();
+ virtual void CloseIdleSockets() OVERRIDE;
- virtual int IdleSocketCount() const;
+ virtual int IdleSocketCount() const OVERRIDE;
- virtual int IdleSocketCountInGroup(const std::string& group_name) const;
+ virtual int IdleSocketCountInGroup(
+ const std::string& group_name) const OVERRIDE;
- virtual LoadState GetLoadState(const std::string& group_name,
- const ClientSocketHandle* handle) const;
+ virtual LoadState GetLoadState(
+ const std::string& group_name,
+ const ClientSocketHandle* handle) const OVERRIDE;
virtual base::DictionaryValue* GetInfoAsValue(
const std::string& name,
const std::string& type,
- bool include_nested_pools) const;
+ bool include_nested_pools) const OVERRIDE;
- virtual base::TimeDelta ConnectionTimeout() const;
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
- virtual ClientSocketPoolHistograms* histograms() const;
+ virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
private:
typedef ClientSocketPoolBase<TransportSocketParams> PoolBase;
@@ -203,9 +205,9 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool {
virtual ConnectJob* NewConnectJob(
const std::string& group_name,
const PoolBase::Request& request,
- ConnectJob::Delegate* delegate) const;
+ ConnectJob::Delegate* delegate) const OVERRIDE;
- virtual base::TimeDelta ConnectionTimeout() const;
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
private:
ClientSocketFactory* const client_socket_factory_;
--
cgit v1.1