| 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 f05e186001fbbd57d2e6497efc3da02cc8346060..6669ae42ab2d68464f24ad8b6f67f1ca1949b08f 100644
|
| --- a/net/url_request/url_request_context_storage.h
|
| +++ b/net/url_request/url_request_context_storage.h
|
| @@ -17,20 +17,21 @@ class ChannelIDService;
|
| class CookieStore;
|
| class FtpTransactionFactory;
|
| class HostResolver;
|
| class HttpAuthHandlerFactory;
|
| class HttpNetworkSession;
|
| class HttpServerProperties;
|
| class HttpTransactionFactory;
|
| class HttpUserAgentSettings;
|
| class NetLog;
|
| class NetworkDelegate;
|
| +class ProxyDelegate;
|
| class ProxyService;
|
| class SdchManager;
|
| class SSLConfigService;
|
| class TransportSecurityState;
|
| class URLRequestContext;
|
| class URLRequestBackoffManager;
|
| class URLRequestJobFactory;
|
| class URLRequestThrottlerManager;
|
|
|
| // URLRequestContextStorage is a helper class that provides storage for unowned
|
| @@ -48,20 +49,21 @@ class NET_EXPORT URLRequestContextStorage {
|
|
|
| void set_net_log(scoped_ptr<NetLog> net_log);
|
| void set_host_resolver(scoped_ptr<HostResolver> host_resolver);
|
| void set_cert_verifier(scoped_ptr<CertVerifier> cert_verifier);
|
| void set_channel_id_service(scoped_ptr<ChannelIDService> channel_id_service);
|
| void set_http_auth_handler_factory(
|
| scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory);
|
| void set_proxy_service(scoped_ptr<ProxyService> proxy_service);
|
| void set_ssl_config_service(SSLConfigService* ssl_config_service);
|
| void set_network_delegate(scoped_ptr<NetworkDelegate> network_delegate);
|
| + void set_proxy_delegate(scoped_ptr<ProxyDelegate> proxy_delegate);
|
| void set_http_server_properties(
|
| scoped_ptr<HttpServerProperties> http_server_properties);
|
| void set_cookie_store(CookieStore* cookie_store);
|
| void set_transport_security_state(
|
| scoped_ptr<TransportSecurityState> transport_security_state);
|
| void set_http_network_session(
|
| scoped_ptr<HttpNetworkSession> http_network_session);
|
| void set_http_transaction_factory(
|
| scoped_ptr<HttpTransactionFactory> http_transaction_factory);
|
| void set_job_factory(scoped_ptr<URLRequestJobFactory> job_factory);
|
| @@ -89,20 +91,21 @@ class NET_EXPORT URLRequestContextStorage {
|
| scoped_ptr<NetLog> net_log_;
|
| scoped_ptr<HostResolver> host_resolver_;
|
| scoped_ptr<CertVerifier> cert_verifier_;
|
| // The ChannelIDService must outlive the HttpTransactionFactory.
|
| scoped_ptr<ChannelIDService> channel_id_service_;
|
| scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
|
| scoped_ptr<ProxyService> proxy_service_;
|
| // TODO(willchan): Remove refcounting on these members.
|
| scoped_refptr<SSLConfigService> ssl_config_service_;
|
| scoped_ptr<NetworkDelegate> network_delegate_;
|
| + scoped_ptr<ProxyDelegate> proxy_delegate_;
|
| scoped_ptr<HttpServerProperties> http_server_properties_;
|
| scoped_ptr<HttpUserAgentSettings> http_user_agent_settings_;
|
| scoped_refptr<CookieStore> cookie_store_;
|
| scoped_ptr<TransportSecurityState> transport_security_state_;
|
|
|
| // Not actually pointed at by the URLRequestContext, but may be used (but not
|
| // owned) by the HttpTransactionFactory.
|
| scoped_ptr<HttpNetworkSession> http_network_session_;
|
|
|
| scoped_ptr<HttpTransactionFactory> http_transaction_factory_;
|
|
|