Chromium Code Reviews| Index: net/url_request/url_request_context.h |
| diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h |
| index 8aeb1e01205557da5b9c03a59bb51c1d6654cbe8..4e4511b3af3e245d6a8bab8c61a06ac5ca88fe5c 100644 |
| --- a/net/url_request/url_request_context.h |
| +++ b/net/url_request/url_request_context.h |
| @@ -23,6 +23,7 @@ |
| #include "net/http/http_server_properties.h" |
| #include "net/http/transport_security_state.h" |
| #include "net/ssl/ssl_config_service.h" |
| +#include "net/traffic_annotation/network_traffic_annotation.h" |
| #include "net/url_request/url_request.h" |
| namespace base { |
| @@ -71,14 +72,20 @@ class NET_EXPORT URLRequestContext |
| // session. |
| const HttpNetworkSession::Params* GetNetworkSessionParams() const; |
| + // DEPRECATED. Please use the version with NetworkTrafficAnnotationTag in the |
| + // future. |
|
battre
2017/02/01 03:48:24
I think that this should not be deprecated.
Ramin Halavati
2017/02/01 10:11:13
Done.
|
| std::unique_ptr<URLRequest> CreateRequest( |
| const GURL& url, |
| RequestPriority priority, |
| URLRequest::Delegate* delegate) const; |
| - NetLog* net_log() const { |
| - return net_log_; |
| - } |
| + std::unique_ptr<URLRequest> CreateRequest( |
| + const GURL& url, |
| + RequestPriority priority, |
| + URLRequest::Delegate* delegate, |
| + NetworkTrafficAnnotationTag traffic_classification) const; |
| + |
| + NetLog* net_log() const { return net_log_; } |
| void set_net_log(NetLog* net_log) { |
| net_log_ = net_log; |