diff options
Diffstat (limited to 'net/socket')
36 files changed, 613 insertions, 613 deletions
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index 9539145..f372aff 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -56,11 +56,11 @@ class DefaultClientSocketFactory : public ClientSocketFactory, CertDatabase::GetInstance()->RemoveObserver(this); } - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE { + virtual void OnCertAdded(const X509Certificate* cert) override { ClearSSLSessionCache(); } - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE { + virtual void OnCACertChanged(const X509Certificate* cert) override { // Per wtc, we actually only need to flush when trust is reduced. // Always flush now because OnCACertChanged does not tell us this. // See comments in ClientSocketPoolManager::OnCACertChanged. @@ -71,7 +71,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, NetLog* net_log, - const NetLog::Source& source) OVERRIDE { + const NetLog::Source& source) override { return scoped_ptr<DatagramClientSocket>( new UDPClientSocket(bind_type, rand_int_cb, net_log, source)); } @@ -79,7 +79,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* net_log, - const NetLog::Source& source) OVERRIDE { + const NetLog::Source& source) override { return scoped_ptr<StreamSocket>( new TCPClientSocket(addresses, net_log, source)); } @@ -88,7 +88,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE { + const SSLClientSocketContext& context) override { // nss_thread_task_runner_ may be NULL if g_use_dedicated_nss_thread is // false or if the dedicated NSS thread failed to start. If so, cause NSS // functions to execute on the current task runner. @@ -120,7 +120,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, #endif } - virtual void ClearSSLSessionCache() OVERRIDE { + virtual void ClearSSLSessionCache() override { SSLClientSocket::ClearSessionCache(); } diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 8079cd4..e2fde00 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -327,10 +327,10 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper void EnableConnectBackupJobs(); // ConnectJob::Delegate methods: - virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE; + virtual void OnConnectJobComplete(int result, ConnectJob* job) override; // NetworkChangeNotifier::IPAddressObserver methods: - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; private: friend class base::RefCounted<ClientSocketPoolBaseHelper>; @@ -856,7 +856,7 @@ class ClientSocketPoolBase { virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const internal::ClientSocketPoolBaseHelper::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE { + ConnectJob::Delegate* delegate) const override { const Request& casted_request = static_cast<const Request&>(request); return connect_job_factory_->NewConnectJob( group_name, casted_request, delegate); diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 5a672b4..3cafc89 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -130,7 +130,7 @@ class MockClientSocket : public StreamSocket { // Socket implementation. virtual int Read( IOBuffer* /* buf */, int len, - const CompletionCallback& /* callback */) OVERRIDE { + const CompletionCallback& /* callback */) override { if (has_unread_data_ && len > 0) { has_unread_data_ = false; was_used_to_convey_data_ = true; @@ -141,50 +141,50 @@ class MockClientSocket : public StreamSocket { virtual int Write( IOBuffer* /* buf */, int len, - const CompletionCallback& /* callback */) OVERRIDE { + const CompletionCallback& /* callback */) override { was_used_to_convey_data_ = true; return len; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { connected_ = true; return OK; } - virtual void Disconnect() OVERRIDE { connected_ = false; } - virtual bool IsConnected() const OVERRIDE { return connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { + virtual void Disconnect() override { connected_ = false; } + virtual bool IsConnected() const override { return connected_; } + virtual bool IsConnectedAndIdle() const override { return connected_ && !has_unread_data_; } - virtual int GetPeerAddress(IPEndPoint* /* address */) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* /* address */) const override { return ERR_UNEXPECTED; } - virtual int GetLocalAddress(IPEndPoint* /* address */) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* /* address */) const override { return ERR_UNEXPECTED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return was_used_to_convey_data_; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return false; } + virtual bool WasNpnNegotiated() const override { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } @@ -207,7 +207,7 @@ 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 { NOTREACHED(); return scoped_ptr<DatagramClientSocket>(); } @@ -215,7 +215,7 @@ class MockClientSocketFactory : public ClientSocketFactory { virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* /* net_log */, - const NetLog::Source& /*source*/) OVERRIDE { + const NetLog::Source& /*source*/) override { allocation_count_++; return scoped_ptr<StreamSocket>(); } @@ -224,12 +224,12 @@ class MockClientSocketFactory : public ClientSocketFactory { scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE { + const SSLClientSocketContext& context) override { NOTIMPLEMENTED(); return scoped_ptr<SSLClientSocket>(); } - virtual void ClearSSLSessionCache() OVERRIDE { + virtual void ClearSSLSessionCache() override { NOTIMPLEMENTED(); } @@ -291,9 +291,9 @@ class TestConnectJob : public ConnectJob { // From ConnectJob: - virtual LoadState GetLoadState() const OVERRIDE { return load_state_; } + virtual LoadState GetLoadState() const override { return load_state_; } - virtual void GetAdditionalErrorState(ClientSocketHandle* handle) OVERRIDE { + virtual void GetAdditionalErrorState(ClientSocketHandle* handle) override { if (store_additional_error_state_) { // Set all of the additional error state fields in some way. handle->set_is_ssl_error(true); @@ -306,7 +306,7 @@ class TestConnectJob : public ConnectJob { private: // From ConnectJob: - virtual int ConnectInternal() OVERRIDE { + virtual int ConnectInternal() override { AddressList ignored; client_socket_factory_->CreateTransportClientSocket( ignored, NULL, net::NetLog::Source()); @@ -457,7 +457,7 @@ class TestConnectJobFactory virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const TestClientSocketPoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE { + ConnectJob::Delegate* delegate) const override { EXPECT_TRUE(!job_types_ || !job_types_->empty()); TestConnectJob::JobType job_type = job_type_; if (job_types_ && !job_types_->empty()) { @@ -473,7 +473,7 @@ class TestConnectJobFactory net_log_)); } - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE { + virtual base::TimeDelta ConnectionTimeout() const override { return timeout_duration_; } @@ -510,7 +510,7 @@ class TestClientSocketPool : public ClientSocketPool { net::RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { const scoped_refptr<TestSocketParams>* casted_socket_params = static_cast<const scoped_refptr<TestSocketParams>*>(params); return base_.RequestSocket(group_name, *casted_socket_params, priority, @@ -520,7 +520,7 @@ class TestClientSocketPool : public ClientSocketPool { virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { const scoped_refptr<TestSocketParams>* casted_params = static_cast<const scoped_refptr<TestSocketParams>*>(params); @@ -529,65 +529,65 @@ class TestClientSocketPool : public ClientSocketPool { virtual void CancelRequest( const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE { + ClientSocketHandle* handle) override { base_.CancelRequest(group_name, handle); } virtual void ReleaseSocket( const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE { + int id) override { base_.ReleaseSocket(group_name, socket.Pass(), id); } - virtual void FlushWithError(int error) OVERRIDE { + virtual void FlushWithError(int error) override { base_.FlushWithError(error); } - virtual bool IsStalled() const OVERRIDE { + virtual bool IsStalled() const override { return base_.IsStalled(); } - virtual void CloseIdleSockets() OVERRIDE { + virtual void CloseIdleSockets() override { base_.CloseIdleSockets(); } - virtual int IdleSocketCount() const OVERRIDE { + virtual int IdleSocketCount() const override { return base_.idle_socket_count(); } virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE { + const std::string& group_name) const override { return base_.IdleSocketCountInGroup(group_name); } virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE { + const ClientSocketHandle* handle) const override { return base_.GetLoadState(group_name, handle); } - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE { + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override { base_.AddHigherLayeredPool(higher_pool); } virtual void RemoveHigherLayeredPool( - HigherLayeredPool* higher_pool) OVERRIDE { + HigherLayeredPool* higher_pool) override { base_.RemoveHigherLayeredPool(higher_pool); } virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE { + bool include_nested_pools) const override { return base_.GetInfoAsValue(name, type); } - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE { + virtual base::TimeDelta ConnectionTimeout() const override { return base_.ConnectionTimeout(); } - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE { + virtual ClientSocketPoolHistograms* histograms() const override { return base_.histograms(); } @@ -653,7 +653,7 @@ class TestConnectJobDelegate : public ConnectJob::Delegate { : have_result_(false), waiting_for_result_(false), result_(OK) {} virtual ~TestConnectJobDelegate() {} - virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE { + virtual void OnConnectJobComplete(int result, ConnectJob* job) override { result_ = result; scoped_ptr<ConnectJob> owned_job(job); scoped_ptr<StreamSocket> socket = owned_job->PassSocket(); diff --git a/net/socket/client_socket_pool_manager_impl.h b/net/socket/client_socket_pool_manager_impl.h index 22afbfa..94fd55d 100644 --- a/net/socket/client_socket_pool_manager_impl.h +++ b/net/socket/client_socket_pool_manager_impl.h @@ -73,29 +73,29 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe, HttpNetworkSession::SocketPoolType pool_type); virtual ~ClientSocketPoolManagerImpl(); - virtual void FlushSocketPoolsWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; + virtual void FlushSocketPoolsWithError(int error) override; + virtual void CloseIdleSockets() override; - virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; + virtual TransportClientSocketPool* GetTransportSocketPool() override; - virtual SSLClientSocketPool* GetSSLSocketPool() OVERRIDE; + virtual SSLClientSocketPool* GetSSLSocketPool() override; virtual SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy( - const HostPortPair& socks_proxy) OVERRIDE; + const HostPortPair& socks_proxy) override; virtual HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy( - const HostPortPair& http_proxy) OVERRIDE; + const HostPortPair& http_proxy) override; virtual SSLClientSocketPool* GetSocketPoolForSSLWithProxy( - const HostPortPair& proxy_server) OVERRIDE; + const HostPortPair& proxy_server) override; // Creates a Value summary of the state of the socket pools. The caller is // responsible for deleting the returned value. - virtual base::Value* SocketPoolInfoToValue() const OVERRIDE; + virtual base::Value* SocketPoolInfoToValue() const override; // CertDatabase::Observer methods: - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE; - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE; + virtual void OnCertAdded(const X509Certificate* cert) override; + virtual void OnCACertChanged(const X509Certificate* cert) override; private: typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> diff --git a/net/socket/mock_client_socket_pool_manager.h b/net/socket/mock_client_socket_pool_manager.h index c2c3792..03930e3 100644 --- a/net/socket/mock_client_socket_pool_manager.h +++ b/net/socket/mock_client_socket_pool_manager.h @@ -27,17 +27,17 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager { SSLClientSocketPool* pool); // ClientSocketPoolManager methods: - virtual void FlushSocketPoolsWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; - virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; - virtual SSLClientSocketPool* GetSSLSocketPool() OVERRIDE; + virtual void FlushSocketPoolsWithError(int error) override; + virtual void CloseIdleSockets() override; + virtual TransportClientSocketPool* GetTransportSocketPool() override; + virtual SSLClientSocketPool* GetSSLSocketPool() override; virtual SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy( - const HostPortPair& socks_proxy) OVERRIDE; + const HostPortPair& socks_proxy) override; virtual HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy( - const HostPortPair& http_proxy) OVERRIDE; + const HostPortPair& http_proxy) override; virtual SSLClientSocketPool* GetSocketPoolForSSLWithProxy( - const HostPortPair& proxy_server) OVERRIDE; - virtual base::Value* SocketPoolInfoToValue() const OVERRIDE; + const HostPortPair& proxy_server) override; + virtual base::Value* SocketPoolInfoToValue() const override; private: typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> diff --git a/net/socket/socket_libevent.h b/net/socket/socket_libevent.h index 5950951..a072738 100644 --- a/net/socket/socket_libevent.h +++ b/net/socket/socket_libevent.h @@ -81,8 +81,8 @@ class NET_EXPORT_PRIVATE SocketLibevent private: // base::MessageLoopForIO::Watcher methods. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; int DoAccept(scoped_ptr<SocketLibevent>* socket); void AcceptCompleted(); diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 50d28ec..1496aec 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_; diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index 8da0b4d..5d4e060 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -43,32 +43,32 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { // StreamSocket implementation. // Does the SOCKS handshake and completes the protocol. - virtual int Connect(const CompletionCallback& 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 bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() 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 const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) 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; + const CompletionCallback& callback) override; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int GetPeerAddress(IPEndPoint* 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 26da332..d480de4 100644 --- a/net/socket/socks_client_socket.h +++ b/net/socket/socks_client_socket.h @@ -40,32 +40,32 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { // StreamSocket implementation. // Does the SOCKS handshake and completes the protocol. - virtual int Connect(const CompletionCallback& 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 bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() 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 const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) 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; + const CompletionCallback& callback) override; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int GetPeerAddress(IPEndPoint* 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 c6d5c8d..d324f0a 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_client_socket_pool.h @@ -66,7 +66,7 @@ class SOCKSConnectJob : public ConnectJob { virtual ~SOCKSConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; private: enum State { @@ -90,7 +90,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() OVERRIDE; + virtual int ConnectInternal() override; scoped_refptr<SOCKSSocketParams> socks_params_; TransportClientSocketPool* const transport_pool_; @@ -125,51 +125,51 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - 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; - virtual void FlushWithError(int error) OVERRIDE; + virtual void FlushWithError(int error) override; - virtual void CloseIdleSockets() OVERRIDE; + virtual void CloseIdleSockets() override; - virtual int IdleSocketCount() const OVERRIDE; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; + bool include_nested_pools) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + virtual ClientSocketPoolHistograms* histograms() const override; // LowerLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; // HigherLayeredPool implementation. - virtual bool CloseOneIdleConnection() OVERRIDE; + virtual bool CloseOneIdleConnection() override; private: typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase; @@ -189,9 +189,9 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: TransportClientSocketPool* const transport_pool_; diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index c8032e6..e3dc359 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -101,7 +101,7 @@ class HangingHostResolverWithCancel : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { DCHECK(addresses); DCHECK_EQ(false, callback.is_null()); EXPECT_FALSE(HasOutstandingRequest()); @@ -112,12 +112,12 @@ class HangingHostResolverWithCancel : public HostResolver { virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { NOTIMPLEMENTED(); return ERR_UNEXPECTED; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { EXPECT_TRUE(HasOutstandingRequest()); EXPECT_EQ(outstanding_request_, req); outstanding_request_ = NULL; diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index 0e32ed6..98eb7741 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -80,8 +80,8 @@ class NET_EXPORT SSLClientSocket : public SSLSocket { }; // StreamSocket: - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; // Computes a unique key string for the SSL session cache. virtual std::string GetSessionCacheKey() const = 0; diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index a2dc610..ccdbb81 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -68,51 +68,51 @@ class SSLClientSocketNSS : public SSLClientSocket { virtual ~SSLClientSocketNSS(); // SSLClientSocket implementation. - virtual std::string GetSessionCacheKey() const OVERRIDE; - virtual bool InSessionCache() const OVERRIDE; + virtual std::string GetSessionCacheKey() const override; + virtual bool InSessionCache() const override; virtual void SetHandshakeCompletionCallback( - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual NextProtoStatus GetNextProto(std::string* proto) override; // SSLSocket implementation. 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; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) 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 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 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 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 bool GetSSLInfo(SSLInfo* ssl_info) 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; - virtual ChannelIDService* GetChannelIDService() const OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; + virtual ChannelIDService* GetChannelIDService() const override; protected: // SSLClientSocket implementation. virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() - const OVERRIDE; + const override; private: // Helper class to handle marshalling any NSS interaction to and from the diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index 1465f845..dff457b 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -59,49 +59,49 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { } // SSLClientSocket implementation. - virtual std::string GetSessionCacheKey() const OVERRIDE; - virtual bool InSessionCache() const OVERRIDE; + virtual std::string GetSessionCacheKey() const override; + virtual bool InSessionCache() const override; virtual void SetHandshakeCompletionCallback( - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; - virtual ChannelIDService* GetChannelIDService() const OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual NextProtoStatus GetNextProto(std::string* proto) override; + virtual ChannelIDService* GetChannelIDService() const override; // SSLSocket implementation. 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; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) 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 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 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 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 bool GetSSLInfo(SSLInfo* ssl_info) 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; protected: // SSLClientSocket implementation. virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() - const OVERRIDE; + const override; private: class PeerCertificateChain; diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index efcce77..58540157 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -197,9 +197,9 @@ class SSLConnectJob : public ConnectJob { virtual ~SSLConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; - virtual void GetAdditionalErrorState(ClientSocketHandle * handle) OVERRIDE; + virtual void GetAdditionalErrorState(ClientSocketHandle * handle) override; private: enum State { @@ -242,7 +242,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() OVERRIDE; + virtual int ConnectInternal() override; scoped_refptr<SSLSocketParams> params_; TransportClientSocketPool* const transport_pool_; @@ -302,51 +302,51 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - 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; - virtual void FlushWithError(int error) OVERRIDE; + virtual void FlushWithError(int error) override; - virtual void CloseIdleSockets() OVERRIDE; + virtual void CloseIdleSockets() override; - virtual int IdleSocketCount() const OVERRIDE; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; + bool include_nested_pools) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + virtual ClientSocketPoolHistograms* histograms() const override; // LowerLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; // HigherLayeredPool implementation. - virtual bool CloseOneIdleConnection() OVERRIDE; + virtual bool CloseOneIdleConnection() override; // Gets the SSLConnectJobMessenger for the given ssl session |cache_key|. If // none exits, it creates one and stores it in |messenger_map_|. @@ -363,7 +363,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() OVERRIDE; + virtual void OnSSLConfigChanged() override; class SSLConnectJobFactory : public PoolBase::ConnectJobFactory { public: @@ -383,9 +383,9 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: TransportClientSocketPool* const transport_pool_; diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 4e844cd..40a4d3c 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -60,62 +60,62 @@ class WrappedStreamSocket : public StreamSocket { virtual ~WrappedStreamSocket() {} // StreamSocket implementation: - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return transport_->Connect(callback); } - virtual void Disconnect() OVERRIDE { transport_->Disconnect(); } - virtual bool IsConnected() const OVERRIDE { + virtual void Disconnect() override { transport_->Disconnect(); } + virtual bool IsConnected() const override { return transport_->IsConnected(); } - virtual bool IsConnectedAndIdle() const OVERRIDE { + virtual bool IsConnectedAndIdle() const override { return transport_->IsConnectedAndIdle(); } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { return transport_->GetPeerAddress(address); } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return transport_->GetLocalAddress(address); } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return transport_->NetLog(); } - virtual void SetSubresourceSpeculation() OVERRIDE { + virtual void SetSubresourceSpeculation() override { transport_->SetSubresourceSpeculation(); } - virtual void SetOmniboxSpeculation() OVERRIDE { + virtual void SetOmniboxSpeculation() override { transport_->SetOmniboxSpeculation(); } - virtual bool WasEverUsed() const OVERRIDE { + virtual bool WasEverUsed() const override { return transport_->WasEverUsed(); } - virtual bool UsingTCPFastOpen() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return transport_->UsingTCPFastOpen(); } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool WasNpnNegotiated() const override { return transport_->WasNpnNegotiated(); } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return transport_->GetNegotiatedProtocol(); } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return transport_->GetSSLInfo(ssl_info); } // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return transport_->Read(buf, buf_len, callback); } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return transport_->Write(buf, buf_len, callback); } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { + virtual int SetReceiveBufferSize(int32 size) override { return transport_->SetReceiveBufferSize(size); } - virtual int SetSendBufferSize(int32 size) OVERRIDE { + virtual int SetSendBufferSize(int32 size) override { return transport_->SetSendBufferSize(size); } @@ -137,7 +137,7 @@ class ReadBufferingStreamSocket : public WrappedStreamSocket { // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Sets the internal buffer to |size|. This must not be greater than // the largest value supplied to Read() - that is, it does not handle @@ -267,10 +267,10 @@ class SynchronousErrorStreamSocket : public WrappedStreamSocket { // 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; // Sets the next Read() call and all future calls to return |error|. // If there is already a pending asynchronous read, the configured error @@ -338,10 +338,10 @@ class FakeBlockingStreamSocket : public WrappedStreamSocket { // 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; // Blocks read results on the socket. Reads will not complete until // UnblockReadResult() has been called and a result is ready from the @@ -554,13 +554,13 @@ class CountingStreamSocket : public WrappedStreamSocket { // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { read_count_++; return transport_->Read(buf, buf_len, callback); } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { write_count_++; return transport_->Write(buf, buf_len, callback); } @@ -609,26 +609,26 @@ class FailingChannelIDStore : public ChannelIDStore { base::Time* expiration_time, std::string* private_key_result, std::string* cert_result, - const GetChannelIDCallback& callback) OVERRIDE { + const GetChannelIDCallback& callback) override { return ERR_UNEXPECTED; } virtual void SetChannelID(const std::string& server_identifier, base::Time creation_time, base::Time expiration_time, const std::string& private_key, - const std::string& cert) OVERRIDE {} + const std::string& cert) override {} virtual void DeleteChannelID(const std::string& server_identifier, const base::Closure& completion_callback) - OVERRIDE {} + override {} virtual void DeleteAllCreatedBetween(base::Time delete_begin, base::Time delete_end, const base::Closure& completion_callback) - OVERRIDE {} - virtual void DeleteAll(const base::Closure& completion_callback) OVERRIDE {} + override {} + virtual void DeleteAll(const base::Closure& completion_callback) override {} virtual void GetAllChannelIDs(const GetChannelIDListCallback& callback) - OVERRIDE {} - virtual int GetChannelIDCount() OVERRIDE { return 0; } - virtual void SetForceKeepSessionState() OVERRIDE {} + override {} + virtual int GetChannelIDCount() override { return 0; } + virtual void SetForceKeepSessionState() override {} }; // A ChannelIDStore that asynchronously returns an error when asked for a @@ -638,7 +638,7 @@ class AsyncFailingChannelIDStore : public ChannelIDStore { base::Time* expiration_time, std::string* private_key_result, std::string* cert_result, - const GetChannelIDCallback& callback) OVERRIDE { + const GetChannelIDCallback& callback) override { base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(callback, ERR_UNEXPECTED, server_identifier, base::Time(), "", "")); @@ -648,19 +648,19 @@ class AsyncFailingChannelIDStore : public ChannelIDStore { base::Time creation_time, base::Time expiration_time, const std::string& private_key, - const std::string& cert) OVERRIDE {} + const std::string& cert) override {} virtual void DeleteChannelID(const std::string& server_identifier, const base::Closure& completion_callback) - OVERRIDE {} + override {} virtual void DeleteAllCreatedBetween(base::Time delete_begin, base::Time delete_end, const base::Closure& completion_callback) - OVERRIDE {} - virtual void DeleteAll(const base::Closure& completion_callback) OVERRIDE {} + override {} + virtual void DeleteAll(const base::Closure& completion_callback) override {} virtual void GetAllChannelIDs(const GetChannelIDListCallback& callback) - OVERRIDE {} - virtual int GetChannelIDCount() OVERRIDE { return 0; } - virtual void SetForceKeepSessionState() OVERRIDE {} + override {} + virtual int GetChannelIDCount() override { return 0; } + virtual void SetForceKeepSessionState() override {} }; // A mock CTVerifier that records every call to Verify but doesn't verify diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h index bc5b65d..eddb543 100644 --- a/net/socket/ssl_server_socket_nss.h +++ b/net/socket/ssl_server_socket_nss.h @@ -31,39 +31,39 @@ class SSLServerSocketNSS : public SSLServerSocket { virtual ~SSLServerSocketNSS(); // SSLServerSocket interface. - virtual int Handshake(const CompletionCallback& callback) OVERRIDE; + virtual int Handshake(const CompletionCallback& callback) override; // SSLSocket interface. 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; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; // Socket interface (via StreamSocket). 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; // 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 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 bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() 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 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 bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; private: enum State { diff --git a/net/socket/ssl_server_socket_openssl.h b/net/socket/ssl_server_socket_openssl.h index e1c8aad..379ca57 100644 --- a/net/socket/ssl_server_socket_openssl.h +++ b/net/socket/ssl_server_socket_openssl.h @@ -33,39 +33,39 @@ class SSLServerSocketOpenSSL : public SSLServerSocket { virtual ~SSLServerSocketOpenSSL(); // SSLServerSocket interface. - virtual int Handshake(const CompletionCallback& callback) OVERRIDE; + virtual int Handshake(const CompletionCallback& callback) override; // SSLSocket interface. 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; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; // Socket interface (via StreamSocket). 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; // 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 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 bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() 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 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 bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; private: enum State { diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index f28d51a..1d70258 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -171,81 +171,81 @@ class FakeSocket : public StreamSocket { } virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { // Read random number of bytes. buf_len = rand() % buf_len + 1; return incoming_->Read(buf, buf_len, callback); } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { // Write random number of bytes. buf_len = rand() % buf_len + 1; return outgoing_->Write(buf, buf_len, callback); } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { + virtual int SetReceiveBufferSize(int32 size) override { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { + virtual int SetSendBufferSize(int32 size) override { return OK; } - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return OK; } - virtual void Disconnect() OVERRIDE { + virtual void Disconnect() override { incoming_->Close(); outgoing_->Close(); } - virtual bool IsConnected() const OVERRIDE { + virtual bool IsConnected() const override { return true; } - virtual bool IsConnectedAndIdle() const OVERRIDE { + virtual bool IsConnectedAndIdle() const override { return true; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { IPAddressNumber ip_address(kIPv4AddressSize); *address = IPEndPoint(ip_address, 0 /*port*/); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { IPAddressNumber ip_address(4); *address = IPEndPoint(ip_address, 0); return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} - virtual bool WasEverUsed() const OVERRIDE { + virtual bool WasEverUsed() const override { return true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool WasNpnNegotiated() const override { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } diff --git a/net/socket/stream_listen_socket.h b/net/socket/stream_listen_socket.h index 813d96a..ead35c4 100644 --- a/net/socket/stream_listen_socket.h +++ b/net/socket/stream_listen_socket.h @@ -116,8 +116,8 @@ class NET_EXPORT StreamListenSocket HANDLE socket_event_; #elif defined(OS_POSIX) // Called by MessagePumpLibevent when the socket is ready to do I/O. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; WaitState wait_state_; // The socket's libevent wrapper. base::MessageLoopForIO::FileDescriptorWatcher watcher_; diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h index 9322624..1672a95 100644 --- a/net/socket/tcp_client_socket.h +++ b/net/socket/tcp_client_socket.h @@ -38,31 +38,31 @@ class NET_EXPORT TCPClientSocket : public StreamSocket { int Bind(const IPEndPoint& address); // 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 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 void EnableTCPFastOpenIfSupported() OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() 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 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 void EnableTCPFastOpenIfSupported() override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. // 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, - 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; virtual bool SetKeepAlive(bool enable, int delay); virtual bool SetNoDelay(bool no_delay); diff --git a/net/socket/tcp_listen_socket.h b/net/socket/tcp_listen_socket.h index 54a91de..d726dcc84 100644 --- a/net/socket/tcp_listen_socket.h +++ b/net/socket/tcp_listen_socket.h @@ -34,7 +34,7 @@ class NET_EXPORT TCPListenSocket : public StreamListenSocket { TCPListenSocket(SocketDescriptor s, StreamListenSocket::Delegate* del); // Implements StreamListenSocket::Accept. - virtual void Accept() OVERRIDE; + virtual void Accept() override; private: DISALLOW_COPY_AND_ASSIGN(TCPListenSocket); @@ -48,7 +48,7 @@ class NET_EXPORT TCPListenSocketFactory : public StreamListenSocketFactory { // StreamListenSocketFactory overrides. virtual scoped_ptr<StreamListenSocket> CreateAndListen( - StreamListenSocket::Delegate* delegate) const OVERRIDE; + StreamListenSocket::Delegate* delegate) const override; private: const std::string ip_; diff --git a/net/socket/tcp_listen_socket_unittest.h b/net/socket/tcp_listen_socket_unittest.h index 1bc31a8..9393370 100644 --- a/net/socket/tcp_listen_socket_unittest.h +++ b/net/socket/tcp_listen_socket_unittest.h @@ -91,10 +91,10 @@ class TCPListenSocketTester : // StreamListenSocket::Delegate: virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE; + scoped_ptr<StreamListenSocket> connection) override; virtual void DidRead(StreamListenSocket* connection, const char* data, - int len) OVERRIDE; - virtual void DidClose(StreamListenSocket* sock) OVERRIDE; + int len) override; + virtual void DidClose(StreamListenSocket* sock) override; scoped_ptr<base::Thread> thread_; base::MessageLoopForIO* loop_; diff --git a/net/socket/tcp_server_socket.h b/net/socket/tcp_server_socket.h index faff9ad..9fc719ad 100644 --- a/net/socket/tcp_server_socket.h +++ b/net/socket/tcp_server_socket.h @@ -22,10 +22,10 @@ class NET_EXPORT_PRIVATE TCPServerSocket : public ServerSocket { virtual ~TCPServerSocket(); // net::ServerSocket implementation. - virtual int Listen(const IPEndPoint& address, int backlog) OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int Listen(const IPEndPoint& address, int backlog) override; + virtual int GetLocalAddress(IPEndPoint* address) const override; virtual int Accept(scoped_ptr<StreamSocket>* socket, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: // Converts |accepted_socket_| and stores the result in diff --git a/net/socket/tcp_socket_win.h b/net/socket/tcp_socket_win.h index a5eed419..80174ad 100644 --- a/net/socket/tcp_socket_win.h +++ b/net/socket/tcp_socket_win.h @@ -101,7 +101,7 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe), class Core; // base::ObjectWatcher::Delegate implementation. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE; + virtual void OnObjectSignaled(HANDLE object) override; int AcceptInternal(scoped_ptr<TCPSocketWin>* socket, IPEndPoint* address); diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h index fce5432..14af726 100644 --- a/net/socket/transport_client_socket_pool.h +++ b/net/socket/transport_client_socket_pool.h @@ -167,7 +167,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob { virtual ~TransportConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; // Rolls |addrlist| forward until the first IPv4 address, if any. // WARNING: this method should only be used to implement the prefer-IPv4 hack. @@ -194,7 +194,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() OVERRIDE; + virtual int ConnectInternal() override; TransportConnectJobHelper helper_; @@ -231,35 +231,35 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - 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; - virtual void FlushWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; - virtual int IdleSocketCount() const OVERRIDE; + int id) override; + virtual void FlushWithError(int error) override; + virtual void CloseIdleSockets() override; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + bool include_nested_pools) const override; + virtual base::TimeDelta ConnectionTimeout() const override; + virtual ClientSocketPoolHistograms* histograms() const override; // HigherLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual bool IsStalled() const override; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; protected: // Methods shared with WebSocketTransportClientSocketPool @@ -287,9 +287,9 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: ClientSocketFactory* const client_socket_factory_; diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc index 98a615d..a56c6b1 100644 --- a/net/socket/transport_client_socket_pool_test_util.cc +++ b/net/socket/transport_client_socket_pool_test_util.cc @@ -38,19 +38,19 @@ class MockConnectClientSocket : public StreamSocket { use_tcp_fastopen_(false) {} // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { connected_ = true; return OK; } - virtual void Disconnect() OVERRIDE { connected_ = false; } - virtual bool IsConnected() const OVERRIDE { return connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return connected_; } + virtual void Disconnect() override { connected_ = false; } + virtual bool IsConnected() const override { return connected_; } + virtual bool IsConnectedAndIdle() const override { return connected_; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { *address = addrlist_.front(); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { if (!connected_) return ERR_SOCKET_NOT_CONNECTED; if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4) @@ -59,34 +59,34 @@ class MockConnectClientSocket : public StreamSocket { SetIPv6Address(address); return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return false; } - virtual void EnableTCPFastOpenIfSupported() OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return false; } + virtual void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } private: bool connected_; @@ -105,49 +105,49 @@ class MockFailingClientSocket : public StreamSocket { use_tcp_fastopen_(false) {} // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return ERR_CONNECTION_FAILED; } - virtual void Disconnect() OVERRIDE {} + virtual void Disconnect() override {} - virtual bool IsConnected() const OVERRIDE { return false; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return false; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual bool IsConnected() const override { return false; } + virtual bool IsConnectedAndIdle() const override { return false; } + virtual int GetPeerAddress(IPEndPoint* address) const override { return ERR_UNEXPECTED; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return ERR_UNEXPECTED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return false; } - virtual void EnableTCPFastOpenIfSupported() OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return false; } + virtual void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } private: const AddressList addrlist_; @@ -211,21 +211,21 @@ class MockTriggerableClientSocket : public StreamSocket { } // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { DCHECK(callback_.is_null()); callback_ = callback; return ERR_IO_PENDING; } - virtual void Disconnect() OVERRIDE {} + virtual void Disconnect() override {} - virtual bool IsConnected() const OVERRIDE { return is_connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return is_connected_; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual bool IsConnected() const override { return is_connected_; } + virtual bool IsConnectedAndIdle() const override { return is_connected_; } + virtual int GetPeerAddress(IPEndPoint* address) const override { *address = addrlist_.front(); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { if (!is_connected_) return ERR_SOCKET_NOT_CONNECTED; if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4) @@ -234,35 +234,35 @@ class MockTriggerableClientSocket : public StreamSocket { SetIPv6Address(address); return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return false; } - virtual void EnableTCPFastOpenIfSupported() OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return false; } + virtual void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } private: void DoCallback() { diff --git a/net/socket/transport_client_socket_pool_test_util.h b/net/socket/transport_client_socket_pool_test_util.h index 40ed1d1..b4adb71 100644 --- a/net/socket/transport_client_socket_pool_test_util.h +++ b/net/socket/transport_client_socket_pool_test_util.h @@ -73,20 +73,20 @@ class MockTransportClientSocketFactory : 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; + const SSLClientSocketContext& context) override; - virtual void ClearSSLSessionCache() OVERRIDE; + virtual void ClearSSLSessionCache() override; int allocation_count() const { return allocation_count_; } diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc index 5548b27..8bfb674 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc @@ -48,18 +48,18 @@ class TransportClientSocketTest // Implement StreamListenSocket::Delegate methods virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE { + scoped_ptr<StreamListenSocket> connection) override { connected_sock_.reset( static_cast<TCPListenSocket*>(connection.release())); } - virtual void DidRead(StreamListenSocket*, const char* str, int len) OVERRIDE { + virtual void DidRead(StreamListenSocket*, const char* str, int len) override { // TODO(dkegel): this might not be long enough to tickle some bugs. connected_sock_->Send(kServerReply, arraysize(kServerReply) - 1, false /* Don't append line feed */); if (close_server_socket_on_next_send_) CloseServerSocket(); } - virtual void DidClose(StreamListenSocket* sock) OVERRIDE {} + virtual void DidClose(StreamListenSocket* sock) override {} // Testcase hooks virtual void SetUp(); diff --git a/net/socket/unix_domain_client_socket_posix.h b/net/socket/unix_domain_client_socket_posix.h index d6f2445..e70694a 100644 --- a/net/socket/unix_domain_client_socket_posix.h +++ b/net/socket/unix_domain_client_socket_posix.h @@ -41,28 +41,28 @@ class NET_EXPORT UnixDomainClientSocket : public StreamSocket { SockaddrStorage* address); // 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 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 bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() 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 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 bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) 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; // Releases ownership of underlying SocketDescriptor to caller. // Internal state is reset so that this object can be used again. diff --git a/net/socket/unix_domain_listen_socket_posix.h b/net/socket/unix_domain_listen_socket_posix.h index bbdbf5f..8b9ba8e 100644 --- a/net/socket/unix_domain_listen_socket_posix.h +++ b/net/socket/unix_domain_listen_socket_posix.h @@ -64,7 +64,7 @@ class NET_EXPORT UnixDomainListenSocket : public StreamListenSocket { bool use_abstract_namespace); // StreamListenSocket: - virtual void Accept() OVERRIDE; + virtual void Accept() override; AuthCallback auth_callback_; @@ -83,7 +83,7 @@ class NET_EXPORT UnixDomainListenSocketFactory // StreamListenSocketFactory: virtual scoped_ptr<StreamListenSocket> CreateAndListen( - StreamListenSocket::Delegate* delegate) const OVERRIDE; + StreamListenSocket::Delegate* delegate) const override; protected: const std::string path_; @@ -107,7 +107,7 @@ class NET_EXPORT UnixDomainListenSocketWithAbstractNamespaceFactory // UnixDomainListenSocketFactory: virtual scoped_ptr<StreamListenSocket> CreateAndListen( - StreamListenSocket::Delegate* delegate) const OVERRIDE; + StreamListenSocket::Delegate* delegate) const override; private: std::string fallback_path_; diff --git a/net/socket/unix_domain_listen_socket_posix_unittest.cc b/net/socket/unix_domain_listen_socket_posix_unittest.cc index 117c5c5..bea60c6 100644 --- a/net/socket/unix_domain_listen_socket_posix_unittest.cc +++ b/net/socket/unix_domain_listen_socket_posix_unittest.cc @@ -95,7 +95,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate { : event_manager_(event_manager) {} virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE { + scoped_ptr<StreamListenSocket> connection) override { LOG(ERROR) << __PRETTY_FUNCTION__; connection_ = connection.Pass(); Notify(EVENT_ACCEPT); @@ -103,7 +103,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate { virtual void DidRead(StreamListenSocket* connection, const char* data, - int len) OVERRIDE { + int len) override { { base::AutoLock lock(mutex_); DCHECK(len); @@ -112,7 +112,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate { Notify(EVENT_READ); } - virtual void DidClose(StreamListenSocket* sock) OVERRIDE { + virtual void DidClose(StreamListenSocket* sock) override { Notify(EVENT_CLOSE); } @@ -169,12 +169,12 @@ class UnixDomainListenSocketTestHelper : public testing::Test { return temp_dir_.path().Append(socket_name); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { event_manager_ = new EventManager(); socket_delegate_.reset(new TestListenSocketDelegate(event_manager_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { socket_.reset(); socket_delegate_.reset(); event_manager_ = NULL; diff --git a/net/socket/unix_domain_server_socket_posix.h b/net/socket/unix_domain_server_socket_posix.h index 65b3fa1..8fd8b34 100644 --- a/net/socket/unix_domain_server_socket_posix.h +++ b/net/socket/unix_domain_server_socket_posix.h @@ -51,13 +51,13 @@ class NET_EXPORT UnixDomainServerSocket : public ServerSocket { Credentials* credentials); // ServerSocket implementation. - virtual int Listen(const IPEndPoint& address, int backlog) OVERRIDE; + virtual int Listen(const IPEndPoint& address, int backlog) override; virtual int ListenWithAddressAndPort(const std::string& unix_domain_path, int port_unused, - int backlog) OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + int backlog) override; + virtual int GetLocalAddress(IPEndPoint* address) const override; virtual int Accept(scoped_ptr<StreamSocket>* socket, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Accepts an incoming connection on |listen_socket_|, but passes back // a raw SocketDescriptor instead of a StreamSocket. diff --git a/net/socket/websocket_endpoint_lock_manager_unittest.cc b/net/socket/websocket_endpoint_lock_manager_unittest.cc index cfc6cc6..cafd1aa 100644 --- a/net/socket/websocket_endpoint_lock_manager_unittest.cc +++ b/net/socket/websocket_endpoint_lock_manager_unittest.cc @@ -22,57 +22,57 @@ class FakeStreamSocket : public StreamSocket { FakeStreamSocket() {} // StreamSocket implementation - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return ERR_FAILED; } - virtual void Disconnect() OVERRIDE { return; } + virtual void Disconnect() override { return; } - virtual bool IsConnected() const OVERRIDE { return false; } + virtual bool IsConnected() const override { return false; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return false; } + virtual bool IsConnectedAndIdle() const override { return false; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { return ERR_FAILED; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return ERR_FAILED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return bound_net_log_; } + virtual const BoundNetLog& NetLog() const override { return bound_net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE { return; } - virtual void SetOmniboxSpeculation() OVERRIDE { return; } + virtual void SetSubresourceSpeculation() override { return; } + virtual void SetOmniboxSpeculation() override { return; } - virtual bool WasEverUsed() const OVERRIDE { return false; } + virtual bool WasEverUsed() const override { return false; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; } + virtual bool UsingTCPFastOpen() const override { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } + virtual bool WasNpnNegotiated() const override { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return ERR_FAILED; } + virtual int SetReceiveBufferSize(int32 size) override { return ERR_FAILED; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return ERR_FAILED; } + virtual int SetSendBufferSize(int32 size) override { return ERR_FAILED; } private: BoundNetLog bound_net_log_; @@ -84,7 +84,7 @@ class FakeWaiter : public WebSocketEndpointLockManager::Waiter { public: FakeWaiter() : called_(false) {} - virtual void GotEndpointLock() OVERRIDE { + virtual void GotEndpointLock() override { CHECK(!called_); called_ = true; } diff --git a/net/socket/websocket_transport_client_socket_pool.h b/net/socket/websocket_transport_client_socket_pool.h index 74b8f78..e918354 100644 --- a/net/socket/websocket_transport_client_socket_pool.h +++ b/net/socket/websocket_transport_client_socket_pool.h @@ -65,7 +65,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : public ConnectJob { const BoundNetLog& request_net_log() const { return request_net_log_; } // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; private: friend class WebSocketTransportConnectSubJob; @@ -90,7 +90,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : 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() OVERRIDE; + virtual int ConnectInternal() override; TransportConnectJobHelper helper_; @@ -138,33 +138,33 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - 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; - virtual void FlushWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; - virtual int IdleSocketCount() const OVERRIDE; + int id) override; + virtual void FlushWithError(int error) override; + virtual void CloseIdleSockets() override; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + bool include_nested_pools) const override; + virtual base::TimeDelta ConnectionTimeout() const override; + virtual ClientSocketPoolHistograms* histograms() const override; // HigherLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; private: class ConnectJobDelegate : public ConnectJob::Delegate { @@ -172,7 +172,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool explicit ConnectJobDelegate(WebSocketTransportClientSocketPool* owner); virtual ~ConnectJobDelegate(); - virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE; + virtual void OnConnectJobComplete(int result, ConnectJob* job) override; private: WebSocketTransportClientSocketPool* owner_; diff --git a/net/socket/websocket_transport_connect_sub_job.h b/net/socket/websocket_transport_connect_sub_job.h index 79980d2..e6f81e82 100644 --- a/net/socket/websocket_transport_connect_sub_job.h +++ b/net/socket/websocket_transport_connect_sub_job.h @@ -47,7 +47,7 @@ class WebSocketTransportConnectSubJob scoped_ptr<StreamSocket> PassSocket() { return transport_socket_.Pass(); } // Implementation of WebSocketEndpointLockManager::EndpointWaiter. - virtual void GotEndpointLock() OVERRIDE; + virtual void GotEndpointLock() override; private: enum State { |