| Index: net/url_request/url_request_context_storage.h
|
| diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
|
| index c47f855838cfb59a923bcb1b6ed3c530287e74cb..3f46e471c6d54168ec5e31865a9a11914925abd5 100644
|
| --- a/net/url_request/url_request_context_storage.h
|
| +++ b/net/url_request/url_request_context_storage.h
|
| @@ -56,10 +56,10 @@ class NET_EXPORT URLRequestContextStorage {
|
| std::unique_ptr<ChannelIDService> channel_id_service);
|
| void set_http_auth_handler_factory(
|
| std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory);
|
| + void set_proxy_delegate(std::unique_ptr<ProxyDelegate> proxy_delegate);
|
| + void set_network_delegate(std::unique_ptr<NetworkDelegate> network_delegate);
|
| void set_proxy_service(std::unique_ptr<ProxyService> proxy_service);
|
| void set_ssl_config_service(SSLConfigService* ssl_config_service);
|
| - void set_network_delegate(std::unique_ptr<NetworkDelegate> network_delegate);
|
| - void set_proxy_delegate(std::unique_ptr<ProxyDelegate> proxy_delegate);
|
| void set_http_server_properties(
|
| std::unique_ptr<HttpServerProperties> http_server_properties);
|
| void set_cookie_store(std::unique_ptr<CookieStore> cookie_store);
|
| @@ -99,11 +99,11 @@ class NET_EXPORT URLRequestContextStorage {
|
| // The ChannelIDService must outlive the HttpTransactionFactory.
|
| std::unique_ptr<ChannelIDService> channel_id_service_;
|
| std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
|
| + std::unique_ptr<ProxyDelegate> proxy_delegate_;
|
| + std::unique_ptr<NetworkDelegate> network_delegate_;
|
| std::unique_ptr<ProxyService> proxy_service_;
|
| // TODO(willchan): Remove refcounting on this member.
|
| scoped_refptr<SSLConfigService> ssl_config_service_;
|
| - std::unique_ptr<NetworkDelegate> network_delegate_;
|
| - std::unique_ptr<ProxyDelegate> proxy_delegate_;
|
| std::unique_ptr<HttpServerProperties> http_server_properties_;
|
| std::unique_ptr<HttpUserAgentSettings> http_user_agent_settings_;
|
| std::unique_ptr<CookieStore> cookie_store_;
|
|
|