| Index: net/url_request/url_request.h
|
| diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
|
| index c6b5f6ade66b040b4c8ce7e3282d044f4b2093df..633240109d11bed4cb33c3f6ed505fc87649e873 100644
|
| --- a/net/url_request/url_request.h
|
| +++ b/net/url_request/url_request.h
|
| @@ -92,14 +92,14 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| // The factory may return NULL to indicate an error, which will cause other
|
| // factories to be queried. If no factory handles the request, then the
|
| // default job will be used.
|
| - typedef URLRequestJob* (ProtocolFactory)(URLRequest* request,
|
| - NetworkDelegate* network_delegate,
|
| - const std::string& scheme);
|
| + typedef URLRequestJob*(ProtocolFactory)(URLRequest* request,
|
| + NetworkDelegate* network_delegate,
|
| + const std::string& scheme);
|
|
|
| // HTTP request/response header IDs (via some preprocessor fun) for use with
|
| // SetRequestHeaderById and GetResponseHeaderById.
|
| enum {
|
| -#define HTTP_ATOM(x) HTTP_ ## x,
|
| +#define HTTP_ATOM(x) HTTP_##x,
|
| #include "net/http/http_atom_list.h"
|
| #undef HTTP_ATOM
|
| };
|
| @@ -122,14 +122,15 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| // This class handles network interception. Use with
|
| // (Un)RegisterRequestInterceptor.
|
| class NET_EXPORT Interceptor {
|
| - public:
|
| + public:
|
| virtual ~Interceptor() {}
|
|
|
| // Called for every request made. Should return a new job to handle the
|
| // request if it should be intercepted, or NULL to allow the request to
|
| // be handled in the normal manner.
|
| virtual URLRequestJob* MaybeIntercept(
|
| - URLRequest* request, NetworkDelegate* network_delegate) = 0;
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate) = 0;
|
|
|
| // Called after having received a redirect response, but prior to the
|
| // the request delegate being informed of the redirect. Can return a new
|
| @@ -151,7 +152,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| // response, instead the response produced by the intercept job will be
|
| // returned.
|
| virtual URLRequestJob* MaybeInterceptResponse(
|
| - URLRequest* request, NetworkDelegate* network_delegate);
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate);
|
| };
|
|
|
| // Deprecated interfaces in net::URLRequest. They have been moved to
|
| @@ -242,9 +244,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| // request->ContinueWithCertificate() with the client certificate the user
|
| // selected, or request->ContinueWithCertificate(NULL) to continue the SSL
|
| // handshake without a client certificate.
|
| - virtual void OnCertificateRequested(
|
| - URLRequest* request,
|
| - SSLCertRequestInfo* cert_request_info);
|
| + virtual void OnCertificateRequested(URLRequest* request,
|
| + SSLCertRequestInfo* cert_request_info);
|
|
|
| // Called when using SSL and the server responds with a certificate with
|
| // an error, for example, whose common name does not match the common name
|
| @@ -405,10 +406,12 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| // Set an extra request header by ID or name, or remove one by name. These
|
| // methods may only be called before Start() is called, or before a new
|
| // redirect in the request chain.
|
| - void SetExtraRequestHeaderById(int header_id, const std::string& value,
|
| + void SetExtraRequestHeaderById(int header_id,
|
| + const std::string& value,
|
| bool overwrite);
|
| void SetExtraRequestHeaderByName(const std::string& name,
|
| - const std::string& value, bool overwrite);
|
| + const std::string& value,
|
| + bool overwrite);
|
| void RemoveRequestHeaderByName(const std::string& name);
|
|
|
| // Sets all extra request headers. Any extra request headers set by other
|
| @@ -487,9 +490,7 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
|
|
| // The time at which the returned response was requested. For cached
|
| // responses, this is the last time the cache entry was validated.
|
| - const base::Time& request_time() const {
|
| - return response_info_.request_time;
|
| - }
|
| + const base::Time& request_time() const { return response_info_.request_time; }
|
|
|
| // The time at which the returned response was generated. For cached
|
| // responses, this is the last time the cache entry was validated.
|
| @@ -519,9 +520,7 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| HttpResponseHeaders* response_headers() const;
|
|
|
| // Get the SSL connection info.
|
| - const SSLInfo& ssl_info() const {
|
| - return response_info_.ssl_info;
|
| - }
|
| + const SSLInfo& ssl_info() const { return response_info_.ssl_info; }
|
|
|
| // Gets timing information related to the request. Events that have not yet
|
| // occurred are left uninitialized. After a second request starts, due to
|
|
|