| Index: net/url_request/url_request_test_util.h
|
| diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
|
| index cad472e4b62edfb8f04297407a4d74cb1fe7fcbb..d30115435f0d3adc70bf6dbc5472825b18acb664 100644
|
| --- a/net/url_request/url_request_test_util.h
|
| +++ b/net/url_request/url_request_test_util.h
|
| @@ -108,9 +108,9 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
|
| scoped_ptr<TestURLRequestContext> context);
|
|
|
| // URLRequestContextGetter implementation.
|
| - virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE;
|
| + virtual TestURLRequestContext* GetURLRequestContext() override;
|
| virtual scoped_refptr<base::SingleThreadTaskRunner>
|
| - GetNetworkTaskRunner() const OVERRIDE;
|
| + GetNetworkTaskRunner() const override;
|
|
|
| protected:
|
| virtual ~TestURLRequestContextGetter();
|
| @@ -171,19 +171,19 @@ class TestDelegate : public URLRequest::Delegate {
|
| // URLRequest::Delegate:
|
| virtual void OnReceivedRedirect(URLRequest* request,
|
| const RedirectInfo& redirect_info,
|
| - bool* defer_redirect) OVERRIDE;
|
| - virtual void OnBeforeNetworkStart(URLRequest* request, bool* defer) OVERRIDE;
|
| + bool* defer_redirect) override;
|
| + virtual void OnBeforeNetworkStart(URLRequest* request, bool* defer) override;
|
| virtual void OnAuthRequired(URLRequest* request,
|
| - AuthChallengeInfo* auth_info) OVERRIDE;
|
| + AuthChallengeInfo* auth_info) override;
|
| // NOTE: |fatal| causes |certificate_errors_are_fatal_| to be set to true.
|
| // (Unit tests use this as a post-condition.) But for policy, this method
|
| // consults |allow_certificate_errors_|.
|
| virtual void OnSSLCertificateError(URLRequest* request,
|
| const SSLInfo& ssl_info,
|
| - bool fatal) OVERRIDE;
|
| - virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
|
| + bool fatal) override;
|
| + virtual void OnResponseStarted(URLRequest* request) override;
|
| virtual void OnReadCompleted(URLRequest* request,
|
| - int bytes_read) OVERRIDE;
|
| + int bytes_read) override;
|
|
|
| private:
|
| static const int kBufferSize = 4096;
|
| @@ -286,52 +286,52 @@ class TestNetworkDelegate : public NetworkDelegate {
|
| // NetworkDelegate:
|
| virtual int OnBeforeURLRequest(URLRequest* request,
|
| const CompletionCallback& callback,
|
| - GURL* new_url) OVERRIDE;
|
| + GURL* new_url) override;
|
| virtual int OnBeforeSendHeaders(URLRequest* request,
|
| const CompletionCallback& callback,
|
| - HttpRequestHeaders* headers) OVERRIDE;
|
| + HttpRequestHeaders* headers) override;
|
| virtual void OnBeforeSendProxyHeaders(
|
| net::URLRequest* request,
|
| const net::ProxyInfo& proxy_info,
|
| - net::HttpRequestHeaders* headers) OVERRIDE;
|
| + net::HttpRequestHeaders* headers) override;
|
| virtual void OnSendHeaders(URLRequest* request,
|
| - const HttpRequestHeaders& headers) OVERRIDE;
|
| + const HttpRequestHeaders& headers) override;
|
| virtual int OnHeadersReceived(
|
| URLRequest* request,
|
| const CompletionCallback& callback,
|
| const HttpResponseHeaders* original_response_headers,
|
| scoped_refptr<HttpResponseHeaders>* override_response_headers,
|
| - GURL* allowed_unsafe_redirect_url) OVERRIDE;
|
| + GURL* allowed_unsafe_redirect_url) override;
|
| virtual void OnBeforeRedirect(URLRequest* request,
|
| - const GURL& new_location) OVERRIDE;
|
| - virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
|
| + const GURL& new_location) override;
|
| + virtual void OnResponseStarted(URLRequest* request) override;
|
| virtual void OnRawBytesRead(const URLRequest& request,
|
| - int bytes_read) OVERRIDE;
|
| - virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE;
|
| - virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE;
|
| + int bytes_read) override;
|
| + virtual void OnCompleted(URLRequest* request, bool started) override;
|
| + virtual void OnURLRequestDestroyed(URLRequest* request) override;
|
| virtual void OnPACScriptError(int line_number,
|
| - const base::string16& error) OVERRIDE;
|
| + const base::string16& error) override;
|
| virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired(
|
| URLRequest* request,
|
| const AuthChallengeInfo& auth_info,
|
| const AuthCallback& callback,
|
| - AuthCredentials* credentials) OVERRIDE;
|
| + AuthCredentials* credentials) override;
|
| virtual bool OnCanGetCookies(const URLRequest& request,
|
| - const CookieList& cookie_list) OVERRIDE;
|
| + const CookieList& cookie_list) override;
|
| virtual bool OnCanSetCookie(const URLRequest& request,
|
| const std::string& cookie_line,
|
| - CookieOptions* options) OVERRIDE;
|
| + CookieOptions* options) override;
|
| virtual bool OnCanAccessFile(const URLRequest& request,
|
| - const base::FilePath& path) const OVERRIDE;
|
| + const base::FilePath& path) const override;
|
| virtual bool OnCanThrottleRequest(
|
| - const URLRequest& request) const OVERRIDE;
|
| + const URLRequest& request) const override;
|
| virtual int OnBeforeSocketStreamConnect(
|
| SocketStream* stream,
|
| - const CompletionCallback& callback) OVERRIDE;
|
| + const CompletionCallback& callback) override;
|
| virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
|
| const URLRequest& request,
|
| const GURL& target_url,
|
| - const GURL& referrer_url) const OVERRIDE;
|
| + const GURL& referrer_url) const override;
|
|
|
| void InitRequestStatesIfNew(int request_id);
|
|
|
| @@ -408,7 +408,7 @@ class TestJobInterceptor : public URLRequestJobFactory::ProtocolHandler {
|
|
|
| virtual URLRequestJob* MaybeCreateJob(
|
| URLRequest* request,
|
| - NetworkDelegate* network_delegate) const OVERRIDE;
|
| + NetworkDelegate* network_delegate) const override;
|
| void set_main_intercept_job(URLRequestJob* job);
|
|
|
| private:
|
|
|