Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1431)

Unified Diff: net/url_request/url_request_context_builder.cc

Issue 10909245: Places that create a CookieMonster should also create a ServerBoundCertService. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/service/net/service_url_request_context.cc ('k') | net/url_request/url_request_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 3228bfbdf61ec66ec61c4a5b324aabadd7232a94..75ba7a542b80c7de31877f07f63060b4f7d893ae 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -10,11 +10,14 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/threading/thread.h"
+#include "base/threading/worker_pool.h"
#include "base/thread_task_runner_handle.h"
#include "net/base/cert_verifier.h"
+#include "net/base/default_server_bound_cert_store.h"
#include "net/base/host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/network_delegate.h"
+#include "net/base/server_bound_cert_service.h"
#include "net/base/ssl_config_service_defaults.h"
#include "net/base/transport_security_state.h"
#include "net/cookies/cookie_monster.h"
@@ -243,6 +246,9 @@ URLRequestContext* URLRequestContextBuilder::Build() {
storage->set_ssl_config_service(new net::SSLConfigServiceDefaults);
storage->set_http_auth_handler_factory(
net::HttpAuthHandlerRegistryFactory::CreateDefault(host_resolver));
+ storage->set_server_bound_cert_service(new net::ServerBoundCertService(
+ new net::DefaultServerBoundCertStore(NULL),
+ base::WorkerPool::GetTaskRunner(true)));
storage->set_cookie_store(new CookieMonster(NULL, NULL));
storage->set_transport_security_state(new net::TransportSecurityState());
storage->set_http_server_properties(new net::HttpServerPropertiesImpl);
@@ -251,6 +257,8 @@ URLRequestContext* URLRequestContextBuilder::Build() {
net::HttpNetworkSession::Params network_session_params;
network_session_params.host_resolver = host_resolver;
network_session_params.cert_verifier = context->cert_verifier();
+ network_session_params.server_bound_cert_service =
+ context->server_bound_cert_service();
network_session_params.transport_security_state =
context->transport_security_state();
network_session_params.proxy_service = context->proxy_service();
@@ -278,8 +286,6 @@ URLRequestContext* URLRequestContextBuilder::Build() {
HttpTransactionFactory* http_transaction_factory = NULL;
if (http_cache_enabled_) {
- network_session_params.server_bound_cert_service =
- context->server_bound_cert_service();
HttpCache::BackendFactory* http_cache_backend = NULL;
if (http_cache_params_.type == HttpCacheParams::DISK) {
context->StartCacheThread();
« no previous file with comments | « chrome/service/net/service_url_request_context.cc ('k') | net/url_request/url_request_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698