| Index: net/http/http_transaction_test_util.h
|
| diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h
|
| index b8663c6e14382b7dd440a77d36c8dc52a89b3efb..e0f5bdae4375847f8de48525829038f8045c5bf0 100644
|
| --- a/net/http/http_transaction_test_util.h
|
| +++ b/net/http/http_transaction_test_util.h
|
| @@ -172,57 +172,57 @@ class MockNetworkTransaction
|
|
|
| virtual int Start(const net::HttpRequestInfo* request,
|
| const net::CompletionCallback& callback,
|
| - const net::BoundNetLog& net_log) OVERRIDE;
|
| + const net::BoundNetLog& net_log) override;
|
|
|
| virtual int RestartIgnoringLastError(
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
|
|
| virtual int RestartWithCertificate(
|
| net::X509Certificate* client_cert,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
|
|
| virtual int RestartWithAuth(
|
| const net::AuthCredentials& credentials,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
|
|
| - virtual bool IsReadyToRestartForAuth() OVERRIDE;
|
| + virtual bool IsReadyToRestartForAuth() override;
|
|
|
| virtual int Read(net::IOBuffer* buf, int buf_len,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
|
|
| - virtual void StopCaching() OVERRIDE;
|
| + virtual void StopCaching() override;
|
|
|
| virtual bool GetFullRequestHeaders(
|
| - net::HttpRequestHeaders* headers) const OVERRIDE;
|
| + net::HttpRequestHeaders* headers) const override;
|
|
|
| - virtual int64 GetTotalReceivedBytes() const OVERRIDE;
|
| + virtual int64 GetTotalReceivedBytes() const override;
|
|
|
| - virtual void DoneReading() OVERRIDE;
|
| + virtual void DoneReading() override;
|
|
|
| - virtual const net::HttpResponseInfo* GetResponseInfo() const OVERRIDE;
|
| + virtual const net::HttpResponseInfo* GetResponseInfo() const override;
|
|
|
| - virtual net::LoadState GetLoadState() const OVERRIDE;
|
| + virtual net::LoadState GetLoadState() const override;
|
|
|
| - virtual net::UploadProgress GetUploadProgress() const OVERRIDE;
|
| + virtual net::UploadProgress GetUploadProgress() const override;
|
|
|
| virtual void SetQuicServerInfo(
|
| - net::QuicServerInfo* quic_server_info) OVERRIDE;
|
| + net::QuicServerInfo* quic_server_info) override;
|
|
|
| virtual bool GetLoadTimingInfo(
|
| - net::LoadTimingInfo* load_timing_info) const OVERRIDE;
|
| + net::LoadTimingInfo* load_timing_info) const override;
|
|
|
| - virtual void SetPriority(net::RequestPriority priority) OVERRIDE;
|
| + virtual void SetPriority(net::RequestPriority priority) override;
|
|
|
| virtual void SetWebSocketHandshakeStreamCreateHelper(
|
| - CreateHelper* create_helper) OVERRIDE;
|
| + CreateHelper* create_helper) override;
|
|
|
| virtual void SetBeforeNetworkStartCallback(
|
| - const BeforeNetworkStartCallback& callback) OVERRIDE;
|
| + const BeforeNetworkStartCallback& callback) override;
|
|
|
| virtual void SetBeforeProxyHeadersSentCallback(
|
| - const BeforeProxyHeadersSentCallback& callback) OVERRIDE;
|
| + const BeforeProxyHeadersSentCallback& callback) override;
|
|
|
| - virtual int ResumeNetworkStart() OVERRIDE;
|
| + virtual int ResumeNetworkStart() override;
|
|
|
| CreateHelper* websocket_handshake_stream_create_helper() {
|
| return websocket_handshake_stream_create_helper_;
|
| @@ -292,9 +292,9 @@ class MockNetworkLayer : public net::HttpTransactionFactory,
|
| // net::HttpTransactionFactory:
|
| virtual int CreateTransaction(
|
| net::RequestPriority priority,
|
| - scoped_ptr<net::HttpTransaction>* trans) OVERRIDE;
|
| - virtual net::HttpCache* GetCache() OVERRIDE;
|
| - virtual net::HttpNetworkSession* GetSession() OVERRIDE;
|
| + scoped_ptr<net::HttpTransaction>* trans) override;
|
| + virtual net::HttpCache* GetCache() override;
|
| + virtual net::HttpNetworkSession* GetSession() override;
|
|
|
| private:
|
| int transaction_count_;
|
|
|