diff options
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index ce61d6e..4b2f0a4 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -8198,15 +8198,15 @@ TEST_P(HttpNetworkTransactionTest, CancelDuringInitRequestBody) { const CompletionCallback& callback() const { return callback_; } // UploadElementReader overrides: - virtual int Init(const CompletionCallback& callback) OVERRIDE { + virtual int Init(const CompletionCallback& callback) override { callback_ = callback; return ERR_IO_PENDING; } - virtual uint64 GetContentLength() const OVERRIDE { return 0; } - virtual uint64 BytesRemaining() const OVERRIDE { return 0; } + virtual uint64 GetContentLength() const override { return 0; } + virtual uint64 BytesRemaining() const override { return 0; } virtual int Read(IOBuffer* buf, int buf_length, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } @@ -9105,7 +9105,7 @@ class CapturingProxyResolver : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { ProxyServer proxy_server(ProxyServer::SCHEME_HTTP, HostPortPair("myproxy", 80)); results->UseProxyServer(proxy_server); @@ -9113,21 +9113,21 @@ class CapturingProxyResolver : public ProxyResolver { return OK; } - virtual void CancelRequest(RequestHandle request) OVERRIDE { + virtual void CancelRequest(RequestHandle request) override { NOTREACHED(); } - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { + virtual LoadState GetLoadState(RequestHandle request) const override { NOTREACHED(); return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() OVERRIDE { + virtual void CancelSetPacScript() override { NOTREACHED(); } virtual int SetPacScript(const scoped_refptr<ProxyResolverScriptData>&, - const CompletionCallback& /*callback*/) OVERRIDE { + const CompletionCallback& /*callback*/) override { return OK; } @@ -10069,7 +10069,7 @@ class UrlRecordingHttpAuthHandlerMock : public HttpAuthHandlerMock { virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE { + std::string* auth_token) override { *url_ = request->url; return HttpAuthHandlerMock::GenerateAuthTokenImpl( credentials, request, callback, auth_token); @@ -11166,21 +11166,21 @@ class OneTimeCachingHostResolver : public net::HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { return host_resolver_.Resolve( info, priority, addresses, callback, out_req, net_log); } virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { int rv = host_resolver_.ResolveFromCache(info, addresses, net_log); if (rv == OK && info.host_port_pair().Equals(host_port_)) host_resolver_.GetHostCache()->clear(); return rv; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { host_resolver_.CancelRequest(req); } @@ -12212,83 +12212,83 @@ class FakeStream : public HttpStreamBase, virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE { + virtual int ReadResponseHeaders(const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual void Close(bool not_reusable) OVERRIDE {} + virtual void Close(bool not_reusable) override {} - virtual bool IsResponseBodyComplete() const OVERRIDE { + virtual bool IsResponseBodyComplete() const override { ADD_FAILURE(); return false; } - virtual bool CanFindEndOfResponse() const OVERRIDE { + virtual bool CanFindEndOfResponse() const override { return false; } - virtual bool IsConnectionReused() const OVERRIDE { + virtual bool IsConnectionReused() const override { ADD_FAILURE(); return false; } - virtual void SetConnectionReused() OVERRIDE { + virtual void SetConnectionReused() override { ADD_FAILURE(); } - virtual bool IsConnectionReusable() const OVERRIDE { + virtual bool IsConnectionReusable() const override { ADD_FAILURE(); return false; } - virtual int64 GetTotalReceivedBytes() const OVERRIDE { + virtual int64 GetTotalReceivedBytes() const override { ADD_FAILURE(); return 0; } virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE { + LoadTimingInfo* load_timing_info) const override { ADD_FAILURE(); return false; } - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual void GetSSLInfo(SSLInfo* ssl_info) override { ADD_FAILURE(); } virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE { + SSLCertRequestInfo* cert_request_info) override { ADD_FAILURE(); } - virtual bool IsSpdyHttpStream() const OVERRIDE { + virtual bool IsSpdyHttpStream() const override { ADD_FAILURE(); return false; } - virtual void Drain(HttpNetworkSession* session) OVERRIDE { + virtual void Drain(HttpNetworkSession* session) override { ADD_FAILURE(); } - virtual void SetPriority(RequestPriority priority) OVERRIDE { + virtual void SetPriority(RequestPriority priority) override { priority_ = priority; } @@ -12337,29 +12337,29 @@ class FakeStreamRequest : public HttpStreamRequest, } virtual int RestartTunnelWithProxyAuth( - const AuthCredentials& credentials) OVERRIDE { + const AuthCredentials& credentials) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual LoadState GetLoadState() const OVERRIDE { + virtual LoadState GetLoadState() const override { ADD_FAILURE(); return LoadState(); } - virtual void SetPriority(RequestPriority priority) OVERRIDE { + virtual void SetPriority(RequestPriority priority) override { priority_ = priority; } - virtual bool was_npn_negotiated() const OVERRIDE { + virtual bool was_npn_negotiated() const override { return false; } - virtual NextProto protocol_negotiated() const OVERRIDE { + virtual NextProto protocol_negotiated() const override { return kProtoUnknown; } - virtual bool using_spdy() const OVERRIDE { + virtual bool using_spdy() const override { return false; } @@ -12389,7 +12389,7 @@ class FakeStreamFactory : public HttpStreamFactory { const SSLConfig& server_ssl_config, const SSLConfig& proxy_ssl_config, HttpStreamRequest::Delegate* delegate, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { FakeStreamRequest* fake_request = new FakeStreamRequest(priority, delegate); last_stream_request_ = fake_request->AsWeakPtr(); return fake_request; @@ -12402,7 +12402,7 @@ class FakeStreamFactory : public HttpStreamFactory { const SSLConfig& proxy_ssl_config, HttpStreamRequest::Delegate* delegate, WebSocketHandshakeStreamBase::CreateHelper* create_helper, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { FakeStreamRequest* fake_request = new FakeStreamRequest(priority, delegate, create_helper); last_stream_request_ = fake_request->AsWeakPtr(); @@ -12413,11 +12413,11 @@ class FakeStreamFactory : public HttpStreamFactory { const HttpRequestInfo& info, RequestPriority priority, const SSLConfig& server_ssl_config, - const SSLConfig& proxy_ssl_config) OVERRIDE { + const SSLConfig& proxy_ssl_config) override { ADD_FAILURE(); } - virtual const HostMappingRules* GetHostMappingRules() const OVERRIDE { + virtual const HostMappingRules* GetHostMappingRules() const override { ADD_FAILURE(); return NULL; } @@ -12435,14 +12435,14 @@ class FakeWebSocketStreamCreateHelper : public: virtual WebSocketHandshakeStreamBase* CreateBasicStream( scoped_ptr<ClientSocketHandle> connection, - bool using_proxy) OVERRIDE { + bool using_proxy) override { NOTREACHED(); return NULL; } virtual WebSocketHandshakeStreamBase* CreateSpdyStream( const base::WeakPtr<SpdySession>& session, - bool use_relative_url) OVERRIDE { + bool use_relative_url) override { NOTREACHED(); return NULL; }; |