Index: net/proxy/proxy_script_fetcher_impl_unittest.cc |
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc |
index 5eb887ed913e3fe5c809e816c53be3b7d9d1a8b3..2073d00cace99f01830b3615931e45421b7647c4 100644 |
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc |
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc |
@@ -84,9 +84,7 @@ class RequestContext : public URLRequestContext { |
storage_.set_job_factory(job_factory); |
} |
- virtual ~RequestContext() { |
- AssertNoURLRequests(); |
- } |
+ ~RequestContext() override { AssertNoURLRequests(); } |
private: |
URLRequestContextStorage storage_; |
@@ -112,26 +110,26 @@ GURL GetTestFileUrl(const std::string& relpath) { |
class BasicNetworkDelegate : public NetworkDelegate { |
public: |
BasicNetworkDelegate() {} |
- virtual ~BasicNetworkDelegate() {} |
+ ~BasicNetworkDelegate() override {} |
private: |
- virtual int OnBeforeURLRequest(URLRequest* request, |
- const CompletionCallback& callback, |
- GURL* new_url) override { |
+ int OnBeforeURLRequest(URLRequest* request, |
+ const CompletionCallback& callback, |
+ GURL* new_url) override { |
EXPECT_TRUE(request->load_flags() & LOAD_DISABLE_CERT_REVOCATION_CHECKING); |
return OK; |
} |
- virtual int OnBeforeSendHeaders(URLRequest* request, |
- const CompletionCallback& callback, |
- HttpRequestHeaders* headers) override { |
+ int OnBeforeSendHeaders(URLRequest* request, |
+ const CompletionCallback& callback, |
+ HttpRequestHeaders* headers) override { |
return OK; |
} |
- virtual void OnSendHeaders(URLRequest* request, |
- const HttpRequestHeaders& headers) override {} |
+ void OnSendHeaders(URLRequest* request, |
+ const HttpRequestHeaders& headers) override {} |
- virtual int OnHeadersReceived( |
+ int OnHeadersReceived( |
URLRequest* request, |
const CompletionCallback& callback, |
const HttpResponseHeaders* original_response_headers, |
@@ -140,22 +138,21 @@ class BasicNetworkDelegate : public NetworkDelegate { |
return OK; |
} |
- virtual void OnBeforeRedirect(URLRequest* request, |
- const GURL& new_location) override {} |
+ void OnBeforeRedirect(URLRequest* request, |
+ const GURL& new_location) override {} |
- virtual void OnResponseStarted(URLRequest* request) override {} |
+ void OnResponseStarted(URLRequest* request) override {} |
- virtual void OnRawBytesRead(const URLRequest& request, |
- int bytes_read) override {} |
+ void OnRawBytesRead(const URLRequest& request, int bytes_read) override {} |
- virtual void OnCompleted(URLRequest* request, bool started) override {} |
+ void OnCompleted(URLRequest* request, bool started) override {} |
- virtual void OnURLRequestDestroyed(URLRequest* request) override {} |
+ void OnURLRequestDestroyed(URLRequest* request) override {} |
- virtual void OnPACScriptError(int line_number, |
- const base::string16& error) override {} |
+ void OnPACScriptError(int line_number, const base::string16& error) override { |
+ } |
- virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired( |
+ NetworkDelegate::AuthRequiredResponse OnAuthRequired( |
URLRequest* request, |
const AuthChallengeInfo& auth_info, |
const AuthCallback& callback, |
@@ -163,28 +160,27 @@ class BasicNetworkDelegate : public NetworkDelegate { |
return NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; |
} |
- virtual bool OnCanGetCookies(const URLRequest& request, |
- const CookieList& cookie_list) override { |
+ bool OnCanGetCookies(const URLRequest& request, |
+ const CookieList& cookie_list) override { |
return true; |
} |
- virtual bool OnCanSetCookie(const URLRequest& request, |
- const std::string& cookie_line, |
- CookieOptions* options) override { |
+ bool OnCanSetCookie(const URLRequest& request, |
+ const std::string& cookie_line, |
+ CookieOptions* options) override { |
return true; |
} |
- virtual bool OnCanAccessFile(const net::URLRequest& request, |
- const base::FilePath& path) const override { |
+ bool OnCanAccessFile(const net::URLRequest& request, |
+ const base::FilePath& path) const override { |
return true; |
} |
- virtual bool OnCanThrottleRequest(const URLRequest& request) const override { |
+ bool OnCanThrottleRequest(const URLRequest& request) const override { |
return false; |
} |
- virtual int OnBeforeSocketStreamConnect( |
- SocketStream* stream, |
- const CompletionCallback& callback) override { |
+ int OnBeforeSocketStreamConnect(SocketStream* stream, |
+ const CompletionCallback& callback) override { |
return OK; |
} |