| 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 0b2f48cdbee7095068a14f0fa91bf120b5b9fdde..7f1c69f2c5717563d3557a49c223e2a1a088f7d3 100644
|
| --- a/net/url_request/url_request_test_util.h
|
| +++ b/net/url_request/url_request_test_util.h
|
| @@ -93,8 +93,8 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
|
|
|
| // URLRequestContextGetter implementation.
|
| virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE;
|
| - virtual scoped_refptr<base::SingleThreadTaskRunner>
|
| - GetNetworkTaskRunner() const OVERRIDE;
|
| + virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
|
| + const OVERRIDE;
|
|
|
| protected:
|
| virtual ~TestURLRequestContextGetter();
|
| @@ -164,7 +164,8 @@ class TestDelegate : public URLRequest::Delegate {
|
| void ClearFullRequestHeaders();
|
|
|
| // URLRequest::Delegate:
|
| - virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
|
| + virtual void OnReceivedRedirect(URLRequest* request,
|
| + const GURL& new_url,
|
| bool* defer_redirect) OVERRIDE;
|
| virtual void OnBeforeNetworkStart(URLRequest* request, bool* defer) OVERRIDE;
|
| virtual void OnAuthRequired(URLRequest* request,
|
| @@ -176,8 +177,7 @@ class TestDelegate : public URLRequest::Delegate {
|
| const SSLInfo& ssl_info,
|
| bool fatal) OVERRIDE;
|
| virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
|
| - virtual void OnReadCompleted(URLRequest* request,
|
| - int bytes_read) OVERRIDE;
|
| + virtual void OnReadCompleted(URLRequest* request, int bytes_read) OVERRIDE;
|
|
|
| private:
|
| static const int kBufferSize = 4096;
|
| @@ -219,7 +219,7 @@ class TestNetworkDelegate : public NetworkDelegate {
|
| public:
|
| enum Options {
|
| NO_GET_COOKIES = 1 << 0,
|
| - NO_SET_COOKIE = 1 << 1,
|
| + NO_SET_COOKIE = 1 << 1,
|
| };
|
|
|
| TestNetworkDelegate();
|
| @@ -245,7 +245,7 @@ class TestNetworkDelegate : public NetworkDelegate {
|
| allowed_unsafe_redirect_url_ = allowed_unsafe_redirect_url;
|
| }
|
|
|
| - void set_cookie_options(int o) {cookie_options_bit_mask_ = o; }
|
| + void set_cookie_options(int o) { cookie_options_bit_mask_ = o; }
|
|
|
| int last_error() const { return last_error_; }
|
| int error_count() const { return error_count_; }
|
| @@ -300,8 +300,7 @@ class TestNetworkDelegate : public NetworkDelegate {
|
| CookieOptions* options) OVERRIDE;
|
| virtual bool OnCanAccessFile(const URLRequest& request,
|
| const base::FilePath& path) const OVERRIDE;
|
| - virtual bool OnCanThrottleRequest(
|
| - const URLRequest& request) const OVERRIDE;
|
| + virtual bool OnCanThrottleRequest(const URLRequest& request) const OVERRIDE;
|
| virtual int OnBeforeSocketStreamConnect(
|
| SocketStream* stream,
|
| const CompletionCallback& callback) OVERRIDE;
|
| @@ -339,7 +338,7 @@ class TestNetworkDelegate : public NetworkDelegate {
|
| LoadTimingInfo load_timing_info_before_auth_;
|
| bool has_load_timing_info_before_auth_;
|
|
|
| - bool can_access_files_; // true by default
|
| + bool can_access_files_; // true by default
|
| bool can_throttle_requests_; // true by default
|
| };
|
|
|
|
|