| Index: net/url_request/url_request_context_builder.cc
|
| diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
|
| index 2e2fcc4941019ce6a5fa086d76a2315851940b79..666bd03653a8ae87919223c46f870b24921b106e 100644
|
| --- a/net/url_request/url_request_context_builder.cc
|
| +++ b/net/url_request/url_request_context_builder.cc
|
| @@ -51,25 +51,25 @@ namespace {
|
| 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 {
|
| 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,
|
| @@ -78,22 +78,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,
|
| @@ -101,31 +100,30 @@ 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 {
|
| // Returning true will only enable throttling if there's also a
|
| // URLRequestThrottlerManager, which there isn't, by default.
|
| return true;
|
| }
|
|
|
| - virtual int OnBeforeSocketStreamConnect(
|
| - SocketStream* stream,
|
| - const CompletionCallback& callback) override {
|
| + int OnBeforeSocketStreamConnect(SocketStream* stream,
|
| + const CompletionCallback& callback) override {
|
| return OK;
|
| }
|
|
|
| @@ -165,9 +163,7 @@ class BasicURLRequestContext : public URLRequestContext {
|
| }
|
|
|
| protected:
|
| - virtual ~BasicURLRequestContext() {
|
| - AssertNoURLRequests();
|
| - }
|
| + ~BasicURLRequestContext() override { AssertNoURLRequests(); }
|
|
|
| private:
|
| // Threads should be torn down last.
|
|
|