Index: net/socket/socket_test_util.h |
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h |
index 1496aec2ebed3c3f98cbd34515d8a1e7964334d4..7bccdaed727ce05e589b6485717444a7d64962a9 100644 |
--- a/net/socket/socket_test_util.h |
+++ b/net/socket/socket_test_util.h |
@@ -243,7 +243,7 @@ class StaticSocketDataProvider : public SocketDataProvider { |
size_t reads_count, |
MockWrite* writes, |
size_t writes_count); |
- virtual ~StaticSocketDataProvider(); |
+ ~StaticSocketDataProvider() override; |
// These functions get access to the next available read and write data. |
const MockRead& PeekRead() const; |
@@ -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; |
+ MockRead GetNextRead() override; |
+ MockWriteResult OnWrite(const std::string& data) override; |
+ void Reset() override; |
private: |
MockRead* reads_; |
@@ -284,7 +284,7 @@ class StaticSocketDataProvider : public SocketDataProvider { |
class DynamicSocketDataProvider : public SocketDataProvider { |
public: |
DynamicSocketDataProvider(); |
- virtual ~DynamicSocketDataProvider(); |
+ ~DynamicSocketDataProvider() override; |
int short_read_limit() const { return short_read_limit_; } |
void set_short_read_limit(int limit) { short_read_limit_ = limit; } |
@@ -292,9 +292,9 @@ class DynamicSocketDataProvider : public SocketDataProvider { |
void allow_unconsumed_reads(bool allow) { allow_unconsumed_reads_ = allow; } |
// SocketDataProvider implementation. |
- virtual MockRead GetNextRead() override; |
+ MockRead GetNextRead() override; |
virtual MockWriteResult OnWrite(const std::string& data) = 0; |
- virtual void Reset() override; |
+ void Reset() override; |
protected: |
// The next time there is a read from this socket, it will return |data|. |
@@ -371,15 +371,15 @@ class DelayedSocketData : public StaticSocketDataProvider { |
size_t reads_count, |
MockWrite* writes, |
size_t writes_count); |
- virtual ~DelayedSocketData(); |
+ ~DelayedSocketData() override; |
void ForceNextRead(); |
// StaticSocketDataProvider: |
- virtual MockRead GetNextRead() override; |
- virtual MockWriteResult OnWrite(const std::string& data) override; |
- virtual void Reset() override; |
- virtual void CompleteRead() override; |
+ MockRead GetNextRead() override; |
+ MockWriteResult OnWrite(const std::string& data) override; |
+ void Reset() override; |
+ void CompleteRead() override; |
private: |
int write_delay_; |
@@ -412,7 +412,7 @@ class OrderedSocketData : public StaticSocketDataProvider { |
size_t reads_count, |
MockWrite* writes, |
size_t writes_count); |
- virtual ~OrderedSocketData(); |
+ ~OrderedSocketData() override; |
// |connect| the result for the connect phase. |
// |reads| the list of MockRead completions. |
@@ -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; |
+ MockRead GetNextRead() override; |
+ MockWriteResult OnWrite(const std::string& data) override; |
+ void Reset() override; |
+ void CompleteRead() override; |
private: |
int sequence_number_; |
@@ -536,7 +536,7 @@ class DeterministicSocketData : public StaticSocketDataProvider { |
size_t reads_count, |
MockWrite* writes, |
size_t writes_count); |
- virtual ~DeterministicSocketData(); |
+ ~DeterministicSocketData() override; |
// Consume all the data up to the give stop point (via SetStop()). |
void Run(); |
@@ -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; |
+ 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 {} |
+ MockWriteResult OnWrite(const std::string& data) override; |
+ void Reset() override; |
+ void CompleteRead() override {} |
private: |
// Invoke the read and write callbacks, if the timing is appropriate. |
@@ -633,7 +633,7 @@ class MockSSLClientSocket; |
class MockClientSocketFactory : public ClientSocketFactory { |
public: |
MockClientSocketFactory(); |
- virtual ~MockClientSocketFactory(); |
+ ~MockClientSocketFactory() override; |
void AddSocketDataProvider(SocketDataProvider* socket); |
void AddSSLSocketDataProvider(SSLSocketDataProvider* socket); |
@@ -650,21 +650,21 @@ class MockClientSocketFactory : public ClientSocketFactory { |
} |
// ClientSocketFactory |
- virtual scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket( |
+ scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket( |
DatagramSocket::BindType bind_type, |
const RandIntCallback& rand_int_cb, |
NetLog* net_log, |
const NetLog::Source& source) override; |
- virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( |
+ scoped_ptr<StreamSocket> CreateTransportClientSocket( |
const AddressList& addresses, |
NetLog* net_log, |
const NetLog::Source& source) override; |
- virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket( |
+ 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; |
+ void ClearSSLSessionCache() override; |
private: |
SocketDataProviderArray<SocketDataProvider> mock_data_; |
@@ -688,42 +688,41 @@ 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; |
+ int SetReceiveBufferSize(int32 size) override; |
+ 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 {} |
+ void Disconnect() override; |
+ bool IsConnected() const override; |
+ bool IsConnectedAndIdle() const override; |
+ int GetPeerAddress(IPEndPoint* address) const override; |
+ int GetLocalAddress(IPEndPoint* address) const override; |
+ const BoundNetLog& NetLog() const override; |
+ void SetSubresourceSpeculation() override {} |
+ 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 void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) |
- 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; |
+ std::string GetSessionCacheKey() const override; |
+ bool InSessionCache() const override; |
+ void SetHandshakeCompletionCallback(const base::Closure& cb) override; |
+ void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) override; |
+ int ExportKeyingMaterial(const base::StringPiece& label, |
+ bool has_context, |
+ const base::StringPiece& context, |
+ unsigned char* out, |
+ unsigned int outlen) override; |
+ int GetTLSUniqueChannelBinding(std::string* out) override; |
+ NextProtoStatus GetNextProto(std::string* proto) override; |
+ ChannelIDService* GetChannelIDService() const override; |
protected: |
- virtual ~MockClientSocket(); |
+ ~MockClientSocket() override; |
void RunCallbackAsync(const CompletionCallback& callback, int result); |
void RunCallback(const CompletionCallback& callback, int result); |
// SSLClientSocket implementation. |
- virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() |
+ scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() |
const override; |
// True if Connect completed successfully and Disconnect hasn't been called. |
@@ -745,32 +744,32 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket { |
MockTCPClientSocket(const AddressList& addresses, |
net::NetLog* net_log, |
SocketDataProvider* socket); |
- virtual ~MockTCPClientSocket(); |
+ ~MockTCPClientSocket() override; |
const AddressList& addresses() const { return addresses_; } |
// Socket implementation. |
- virtual int Read(IOBuffer* buf, |
- int buf_len, |
- const CompletionCallback& callback) override; |
- virtual int Write(IOBuffer* buf, |
- int buf_len, |
- const CompletionCallback& callback) override; |
+ int Read(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int Write(IOBuffer* buf, |
+ int buf_len, |
+ 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; |
+ int Connect(const CompletionCallback& callback) override; |
+ void Disconnect() override; |
+ bool IsConnected() const override; |
+ bool IsConnectedAndIdle() const override; |
+ int GetPeerAddress(IPEndPoint* address) const override; |
+ bool WasEverUsed() const override; |
+ bool UsingTCPFastOpen() const override; |
+ bool WasNpnNegotiated() const override; |
+ bool GetSSLInfo(SSLInfo* ssl_info) override; |
// AsyncSocket: |
- virtual void OnReadComplete(const MockRead& data) override; |
- virtual void OnConnectComplete(const MockConnect& data) override; |
+ void OnReadComplete(const MockRead& data) override; |
+ void OnConnectComplete(const MockConnect& data) override; |
private: |
int CompleteRead(); |
@@ -851,36 +850,36 @@ class DeterministicMockUDPClientSocket |
public: |
DeterministicMockUDPClientSocket(net::NetLog* net_log, |
DeterministicSocketData* data); |
- virtual ~DeterministicMockUDPClientSocket(); |
+ ~DeterministicMockUDPClientSocket() override; |
// DeterministicSocketData::Delegate: |
- virtual bool WritePending() const override; |
- virtual bool ReadPending() const override; |
- virtual void CompleteWrite() override; |
- virtual int CompleteRead() override; |
+ bool WritePending() const override; |
+ bool ReadPending() const override; |
+ void CompleteWrite() override; |
+ int CompleteRead() override; |
// Socket implementation. |
- virtual int Read(IOBuffer* buf, |
- int buf_len, |
- 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; |
+ int Read(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int Write(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int SetReceiveBufferSize(int32 size) override; |
+ 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; |
+ void Close() override; |
+ int GetPeerAddress(IPEndPoint* address) const override; |
+ int GetLocalAddress(IPEndPoint* address) const override; |
+ const BoundNetLog& NetLog() const override; |
// DatagramClientSocket implementation. |
- virtual int Connect(const IPEndPoint& address) override; |
+ int Connect(const IPEndPoint& address) override; |
// AsyncSocket implementation. |
- virtual void OnReadComplete(const MockRead& data) override; |
- virtual void OnConnectComplete(const MockConnect& data) override; |
+ void OnReadComplete(const MockRead& data) override; |
+ void OnConnectComplete(const MockConnect& data) override; |
void set_source_port(int port) { source_port_ = port; } |
@@ -902,35 +901,35 @@ class DeterministicMockTCPClientSocket |
public: |
DeterministicMockTCPClientSocket(net::NetLog* net_log, |
DeterministicSocketData* data); |
- virtual ~DeterministicMockTCPClientSocket(); |
+ ~DeterministicMockTCPClientSocket() override; |
// DeterministicSocketData::Delegate: |
- virtual bool WritePending() const override; |
- virtual bool ReadPending() const override; |
- virtual void CompleteWrite() override; |
- virtual int CompleteRead() override; |
+ bool WritePending() const override; |
+ bool ReadPending() const override; |
+ void CompleteWrite() override; |
+ int CompleteRead() override; |
// Socket: |
- virtual int Write(IOBuffer* buf, |
- int buf_len, |
- const CompletionCallback& callback) override; |
- virtual int Read(IOBuffer* buf, |
- int buf_len, |
- const CompletionCallback& callback) override; |
+ int Write(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int Read(IOBuffer* buf, |
+ int buf_len, |
+ 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; |
+ int Connect(const CompletionCallback& callback) override; |
+ void Disconnect() override; |
+ bool IsConnected() const override; |
+ bool IsConnectedAndIdle() const override; |
+ bool WasEverUsed() const override; |
+ bool UsingTCPFastOpen() const override; |
+ bool WasNpnNegotiated() const override; |
+ bool GetSSLInfo(SSLInfo* ssl_info) override; |
// AsyncSocket: |
- virtual void OnReadComplete(const MockRead& data) override; |
- virtual void OnConnectComplete(const MockConnect& data) override; |
+ void OnReadComplete(const MockRead& data) override; |
+ void OnConnectComplete(const MockConnect& data) override; |
private: |
DeterministicSocketHelper helper_; |
@@ -944,44 +943,43 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { |
const HostPortPair& host_and_port, |
const SSLConfig& ssl_config, |
SSLSocketDataProvider* socket); |
- virtual ~MockSSLClientSocket(); |
+ ~MockSSLClientSocket() override; |
// Socket implementation. |
- virtual int Read(IOBuffer* buf, |
- int buf_len, |
- const CompletionCallback& callback) override; |
- virtual int Write(IOBuffer* buf, |
- int buf_len, |
- const CompletionCallback& callback) override; |
+ int Read(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int Write(IOBuffer* buf, |
+ int buf_len, |
+ 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; |
+ int Connect(const CompletionCallback& callback) override; |
+ void Disconnect() override; |
+ bool IsConnected() const override; |
+ bool WasEverUsed() const override; |
+ bool UsingTCPFastOpen() const override; |
+ int GetPeerAddress(IPEndPoint* address) const override; |
+ bool WasNpnNegotiated() const override; |
+ 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 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; |
+ std::string GetSessionCacheKey() const override; |
+ bool InSessionCache() const override; |
+ void SetHandshakeCompletionCallback(const base::Closure& cb) override; |
+ void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) override; |
+ NextProtoStatus GetNextProto(std::string* proto) override; |
+ bool set_was_npn_negotiated(bool negotiated) override; |
+ void set_protocol_negotiated(NextProto protocol_negotiated) override; |
+ 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; |
+ void OnReadComplete(const MockRead& data) override; |
+ 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; |
+ bool WasChannelIDSent() const override; |
+ void set_channel_id_sent(bool channel_id_sent) override; |
+ ChannelIDService* GetChannelIDService() const override; |
bool reached_connect() const { return reached_connect_; } |
@@ -1028,30 +1026,30 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { |
class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket { |
public: |
MockUDPClientSocket(SocketDataProvider* data, net::NetLog* net_log); |
- virtual ~MockUDPClientSocket(); |
+ ~MockUDPClientSocket() override; |
// Socket implementation. |
- virtual int Read(IOBuffer* buf, |
- int buf_len, |
- 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; |
+ int Read(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int Write(IOBuffer* buf, |
+ int buf_len, |
+ const CompletionCallback& callback) override; |
+ int SetReceiveBufferSize(int32 size) override; |
+ 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; |
+ void Close() override; |
+ int GetPeerAddress(IPEndPoint* address) const override; |
+ int GetLocalAddress(IPEndPoint* address) const override; |
+ const BoundNetLog& NetLog() const override; |
// DatagramClientSocket implementation. |
- virtual int Connect(const IPEndPoint& address) override; |
+ int Connect(const IPEndPoint& address) override; |
// AsyncSocket implementation. |
- virtual void OnReadComplete(const MockRead& data) override; |
- virtual void OnConnectComplete(const MockConnect& data) override; |
+ void OnReadComplete(const MockRead& data) override; |
+ void OnConnectComplete(const MockConnect& data) override; |
void set_source_port(int port) { source_port_ = port;} |
@@ -1087,7 +1085,7 @@ class TestSocketRequest : public TestCompletionCallbackBase { |
public: |
TestSocketRequest(std::vector<TestSocketRequest*>* request_order, |
size_t* completion_count); |
- virtual ~TestSocketRequest(); |
+ ~TestSocketRequest() override; |
ClientSocketHandle* handle() { return &handle_; } |
@@ -1207,7 +1205,7 @@ class MockTransportClientSocketPool : public TransportClientSocketPool { |
ClientSocketPoolHistograms* histograms, |
ClientSocketFactory* socket_factory); |
- virtual ~MockTransportClientSocketPool(); |
+ ~MockTransportClientSocketPool() override; |
RequestPriority last_request_priority() const { |
return last_request_priority_; |
@@ -1216,18 +1214,18 @@ class MockTransportClientSocketPool : public TransportClientSocketPool { |
int cancel_count() const { return cancel_count_; } |
// TransportClientSocketPool implementation. |
- virtual int RequestSocket(const std::string& group_name, |
- const void* socket_params, |
- RequestPriority priority, |
- ClientSocketHandle* handle, |
- const CompletionCallback& callback, |
- const BoundNetLog& net_log) override; |
- |
- virtual void CancelRequest(const std::string& group_name, |
- ClientSocketHandle* handle) override; |
- virtual void ReleaseSocket(const std::string& group_name, |
- scoped_ptr<StreamSocket> socket, |
- int id) override; |
+ int RequestSocket(const std::string& group_name, |
+ const void* socket_params, |
+ RequestPriority priority, |
+ ClientSocketHandle* handle, |
+ const CompletionCallback& callback, |
+ const BoundNetLog& net_log) override; |
+ |
+ void CancelRequest(const std::string& group_name, |
+ ClientSocketHandle* handle) override; |
+ void ReleaseSocket(const std::string& group_name, |
+ scoped_ptr<StreamSocket> socket, |
+ int id) override; |
private: |
ClientSocketFactory* client_socket_factory_; |
@@ -1242,7 +1240,7 @@ class MockTransportClientSocketPool : public TransportClientSocketPool { |
class DeterministicMockClientSocketFactory : public ClientSocketFactory { |
public: |
DeterministicMockClientSocketFactory(); |
- virtual ~DeterministicMockClientSocketFactory(); |
+ ~DeterministicMockClientSocketFactory() override; |
void AddSocketDataProvider(DeterministicSocketData* socket); |
void AddSSLSocketDataProvider(SSLSocketDataProvider* socket); |
@@ -1263,21 +1261,21 @@ class DeterministicMockClientSocketFactory : public ClientSocketFactory { |
} |
// ClientSocketFactory |
- virtual scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket( |
+ scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket( |
DatagramSocket::BindType bind_type, |
const RandIntCallback& rand_int_cb, |
NetLog* net_log, |
const NetLog::Source& source) override; |
- virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( |
+ scoped_ptr<StreamSocket> CreateTransportClientSocket( |
const AddressList& addresses, |
NetLog* net_log, |
const NetLog::Source& source) override; |
- virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket( |
+ 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; |
+ void ClearSSLSessionCache() override; |
private: |
SocketDataProviderArray<DeterministicSocketData> mock_data_; |
@@ -1298,21 +1296,21 @@ class MockSOCKSClientSocketPool : public SOCKSClientSocketPool { |
ClientSocketPoolHistograms* histograms, |
TransportClientSocketPool* transport_pool); |
- virtual ~MockSOCKSClientSocketPool(); |
+ ~MockSOCKSClientSocketPool() override; |
// SOCKSClientSocketPool implementation. |
- virtual int RequestSocket(const std::string& group_name, |
- const void* socket_params, |
- RequestPriority priority, |
- ClientSocketHandle* handle, |
- const CompletionCallback& callback, |
- const BoundNetLog& net_log) override; |
- |
- virtual void CancelRequest(const std::string& group_name, |
- ClientSocketHandle* handle) override; |
- virtual void ReleaseSocket(const std::string& group_name, |
- scoped_ptr<StreamSocket> socket, |
- int id) override; |
+ int RequestSocket(const std::string& group_name, |
+ const void* socket_params, |
+ RequestPriority priority, |
+ ClientSocketHandle* handle, |
+ const CompletionCallback& callback, |
+ const BoundNetLog& net_log) override; |
+ |
+ void CancelRequest(const std::string& group_name, |
+ ClientSocketHandle* handle) override; |
+ void ReleaseSocket(const std::string& group_name, |
+ scoped_ptr<StreamSocket> socket, |
+ int id) override; |
private: |
TransportClientSocketPool* const transport_pool_; |