diff options
Diffstat (limited to 'net/http')
-rw-r--r-- | net/http/http_auth_cache_unittest.cc | 8 | ||||
-rw-r--r-- | net/http/http_auth_handler_factory_unittest.cc | 2 | ||||
-rw-r--r-- | net/http/http_network_transaction_spdy2_unittest.cc | 14 | ||||
-rw-r--r-- | net/http/http_network_transaction_spdy3_unittest.cc | 14 | ||||
-rw-r--r-- | net/http/http_response_body_drainer_unittest.cc | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc index d782f5e..286d44a 100644 --- a/net/http/http_auth_cache_unittest.cc +++ b/net/http/http_auth_cache_unittest.cc @@ -31,26 +31,26 @@ class MockAuthHandler : public HttpAuthHandler { } virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuth::ChallengeTokenizer* challenge) { + HttpAuth::ChallengeTokenizer* challenge) OVERRIDE { return HttpAuth::AUTHORIZATION_RESULT_REJECT; } protected: - virtual bool Init(HttpAuth::ChallengeTokenizer* challenge) { + virtual bool Init(HttpAuth::ChallengeTokenizer* challenge) OVERRIDE { return false; // Unused. } virtual int GenerateAuthTokenImpl(const AuthCredentials*, const HttpRequestInfo*, const CompletionCallback& callback, - std::string* auth_token) { + std::string* auth_token) OVERRIDE { *auth_token = "mock-credentials"; return OK; } private: - ~MockAuthHandler() {} + virtual ~MockAuthHandler() {} }; const char* kRealm1 = "Realm1"; diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc index 906f47d..cc5c6d4 100644 --- a/net/http/http_auth_handler_factory_unittest.cc +++ b/net/http/http_auth_handler_factory_unittest.cc @@ -27,7 +27,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory { CreateReason reason, int nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) { + scoped_ptr<HttpAuthHandler>* handler) OVERRIDE { handler->reset(); return return_code_; } diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index c76d205d..3172a92 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -8496,7 +8496,7 @@ class CapturingProxyResolver : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) { + const BoundNetLog& net_log) OVERRIDE { ProxyServer proxy_server(ProxyServer::SCHEME_HTTP, HostPortPair("myproxy", 80)); results->UseProxyServer(proxy_server); @@ -8504,7 +8504,7 @@ class CapturingProxyResolver : public ProxyResolver { return OK; } - virtual void CancelRequest(RequestHandle request) { + virtual void CancelRequest(RequestHandle request) OVERRIDE { NOTREACHED(); } @@ -8513,12 +8513,12 @@ class CapturingProxyResolver : public ProxyResolver { return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() { + virtual void CancelSetPacScript() OVERRIDE { NOTREACHED(); } virtual int SetPacScript(const scoped_refptr<ProxyResolverScriptData>&, - const CompletionCallback& /*callback*/) { + const CompletionCallback& /*callback*/) OVERRIDE { return OK; } @@ -9366,7 +9366,7 @@ class TLSDecompressionFailureSocketDataProvider : public SocketDataProvider { : fail_all_(fail_all) { } - virtual MockRead GetNextRead() { + virtual MockRead GetNextRead() OVERRIDE { if (fail_all_) return MockRead(SYNCHRONOUS, ERR_SSL_DECOMPRESSION_FAILURE_ALERT); @@ -9374,11 +9374,11 @@ class TLSDecompressionFailureSocketDataProvider : public SocketDataProvider { "HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nok.\r\n"); } - virtual MockWriteResult OnWrite(const std::string& data) { + virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { return MockWriteResult(SYNCHRONOUS /* async */, data.size()); } - void Reset() { + virtual void Reset() OVERRIDE { } private: diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index e0787d6..7d9b2df 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -8476,7 +8476,7 @@ class CapturingProxyResolver : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) { + const BoundNetLog& net_log) OVERRIDE { ProxyServer proxy_server(ProxyServer::SCHEME_HTTP, HostPortPair("myproxy", 80)); results->UseProxyServer(proxy_server); @@ -8484,7 +8484,7 @@ class CapturingProxyResolver : public ProxyResolver { return OK; } - virtual void CancelRequest(RequestHandle request) { + virtual void CancelRequest(RequestHandle request) OVERRIDE { NOTREACHED(); } @@ -8493,12 +8493,12 @@ class CapturingProxyResolver : public ProxyResolver { return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() { + virtual void CancelSetPacScript() OVERRIDE { NOTREACHED(); } virtual int SetPacScript(const scoped_refptr<ProxyResolverScriptData>&, - const CompletionCallback& /*callback*/) { + const CompletionCallback& /*callback*/) OVERRIDE { return OK; } @@ -9346,7 +9346,7 @@ class TLSDecompressionFailureSocketDataProvider : public SocketDataProvider { : fail_all_(fail_all) { } - virtual MockRead GetNextRead() { + virtual MockRead GetNextRead() OVERRIDE { if (fail_all_) return MockRead(SYNCHRONOUS, ERR_SSL_DECOMPRESSION_FAILURE_ALERT); @@ -9354,11 +9354,11 @@ class TLSDecompressionFailureSocketDataProvider : public SocketDataProvider { "HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nok.\r\n"); } - virtual MockWriteResult OnWrite(const std::string& data) { + virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { return MockWriteResult(SYNCHRONOUS /* async */, data.size()); } - void Reset() { + virtual void Reset() OVERRIDE { } private: diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index 6294a3e..d6bde8a 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc @@ -216,7 +216,7 @@ class HttpResponseBodyDrainerTest : public testing::Test { mock_stream_(new MockHttpStream(&result_waiter_)), drainer_(new HttpResponseBodyDrainer(mock_stream_)) {} - ~HttpResponseBodyDrainerTest() {} + virtual ~HttpResponseBodyDrainerTest() {} HttpNetworkSession* CreateNetworkSession() const { HttpNetworkSession::Params params; |