| Index: net/url_request/url_request_context.cc
|
| ===================================================================
|
| --- net/url_request/url_request_context.cc (revision 94628)
|
| +++ net/url_request/url_request_context.cc (working copy)
|
| @@ -7,6 +7,7 @@
|
| #include "base/string_util.h"
|
| #include "net/base/cookie_store.h"
|
| #include "net/base/host_resolver.h"
|
| +#include "net/base/origin_bound_cert_service.h"
|
| #include "net/ftp/ftp_transaction_factory.h"
|
| #include "net/http/http_transaction_factory.h"
|
|
|
| @@ -16,12 +17,12 @@
|
| : net_log_(NULL),
|
| host_resolver_(NULL),
|
| cert_verifier_(NULL),
|
| - origin_bound_cert_service_(NULL),
|
| dnsrr_resolver_(NULL),
|
| dns_cert_checker_(NULL),
|
| http_auth_handler_factory_(NULL),
|
| proxy_service_(NULL),
|
| network_delegate_(NULL),
|
| + origin_bound_cert_service_(NULL),
|
| transport_security_state_(NULL),
|
| ftp_auth_cache_(new FtpAuthCache),
|
| http_transaction_factory_(NULL),
|
| @@ -34,7 +35,6 @@
|
| set_net_log(other->net_log());
|
| set_host_resolver(other->host_resolver());
|
| set_cert_verifier(other->cert_verifier());
|
| - set_origin_bound_cert_service(other->origin_bound_cert_service());
|
| set_dnsrr_resolver(other->dnsrr_resolver());
|
| set_dns_cert_checker(other->dns_cert_checker());
|
| set_http_auth_handler_factory(other->http_auth_handler_factory());
|
| @@ -42,6 +42,7 @@
|
| set_ssl_config_service(other->ssl_config_service());
|
| set_network_delegate(other->network_delegate());
|
| set_cookie_store(other->cookie_store());
|
| + set_origin_bound_cert_service(other->origin_bound_cert_service());
|
| set_transport_security_state(other->transport_security_state());
|
| // FTPAuthCache is unique per context.
|
| set_accept_language(other->accept_language());
|
| @@ -56,6 +57,11 @@
|
| cookie_store_ = cookie_store;
|
| }
|
|
|
| +void URLRequestContext::set_origin_bound_cert_service(
|
| + OriginBoundCertService* origin_bound_cert_service) {
|
| + origin_bound_cert_service_ = origin_bound_cert_service;
|
| +}
|
| +
|
| const std::string& URLRequestContext::GetUserAgent(const GURL& url) const {
|
| return EmptyString();
|
| }
|
|
|