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

Side by Side Diff: chrome/service/net/service_url_request_context.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/service/net/service_url_request_context.h" 5 #include "chrome/service/net/service_url_request_context.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <sys/utsname.h> 8 #include <sys/utsname.h>
9 #endif 9 #endif
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "base/threading/worker_pool.h"
15 #include "chrome/common/chrome_version_info.h" 16 #include "chrome/common/chrome_version_info.h"
16 #include "chrome/service/service_process.h" 17 #include "chrome/service/service_process.h"
17 #include "net/base/cert_verifier.h" 18 #include "net/base/cert_verifier.h"
19 #include "net/base/default_server_bound_cert_store.h"
18 #include "net/base/host_resolver.h" 20 #include "net/base/host_resolver.h"
21 #include "net/base/server_bound_cert_service.h"
19 #include "net/base/ssl_config_service_defaults.h" 22 #include "net/base/ssl_config_service_defaults.h"
20 #include "net/cookies/cookie_monster.h" 23 #include "net/cookies/cookie_monster.h"
21 #include "net/ftp/ftp_network_layer.h" 24 #include "net/ftp/ftp_network_layer.h"
22 #include "net/http/http_auth_handler_factory.h" 25 #include "net/http/http_auth_handler_factory.h"
23 #include "net/http/http_cache.h" 26 #include "net/http/http_cache.h"
24 #include "net/http/http_network_session.h" 27 #include "net/http/http_network_session.h"
25 #include "net/http/http_server_properties_impl.h" 28 #include "net/http/http_server_properties_impl.h"
26 #include "net/proxy/proxy_config_service.h" 29 #include "net/proxy/proxy_config_service.h"
27 #include "net/proxy/proxy_service.h" 30 #include "net/proxy/proxy_service.h"
28 #include "net/url_request/url_request_throttler_manager.h" 31 #include "net/url_request/url_request_throttler_manager.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 net_proxy_config_service, 0u, NULL)); 121 net_proxy_config_service, 0u, NULL));
119 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); 122 storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
120 storage_.set_ftp_transaction_factory( 123 storage_.set_ftp_transaction_factory(
121 new net::FtpNetworkLayer(host_resolver())); 124 new net::FtpNetworkLayer(host_resolver()));
122 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); 125 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
123 storage_.set_http_auth_handler_factory( 126 storage_.set_http_auth_handler_factory(
124 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 127 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
125 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); 128 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
126 storage_.set_transport_security_state(new net::TransportSecurityState); 129 storage_.set_transport_security_state(new net::TransportSecurityState);
127 storage_.set_throttler_manager(new net::URLRequestThrottlerManager); 130 storage_.set_throttler_manager(new net::URLRequestThrottlerManager);
131 // In-memory server bound cert service.
132 storage_.set_server_bound_cert_service(new net::ServerBoundCertService(
133 new net::DefaultServerBoundCertStore(NULL),
134 base::WorkerPool::GetTaskRunner(true)));
128 135
129 net::HttpNetworkSession::Params session_params; 136 net::HttpNetworkSession::Params session_params;
130 session_params.host_resolver = host_resolver(); 137 session_params.host_resolver = host_resolver();
131 session_params.cert_verifier = cert_verifier(); 138 session_params.cert_verifier = cert_verifier();
139 session_params.server_bound_cert_service = server_bound_cert_service();
132 session_params.proxy_service = proxy_service(); 140 session_params.proxy_service = proxy_service();
133 session_params.ssl_config_service = ssl_config_service(); 141 session_params.ssl_config_service = ssl_config_service();
134 session_params.http_auth_handler_factory = http_auth_handler_factory(); 142 session_params.http_auth_handler_factory = http_auth_handler_factory();
135 session_params.http_server_properties = http_server_properties(); 143 session_params.http_server_properties = http_server_properties();
136 scoped_refptr<net::HttpNetworkSession> network_session( 144 scoped_refptr<net::HttpNetworkSession> network_session(
137 new net::HttpNetworkSession(session_params)); 145 new net::HttpNetworkSession(session_params));
138 storage_.set_http_transaction_factory( 146 storage_.set_http_transaction_factory(
139 new net::HttpCache( 147 new net::HttpCache(
140 network_session, 148 network_session,
141 net::HttpCache::DefaultBackend::InMemory(0))); 149 net::HttpCache::DefaultBackend::InMemory(0)));
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 proxy_config_service_.release())); 187 proxy_config_service_.release()));
180 return url_request_context_.get(); 188 return url_request_context_.get();
181 } 189 }
182 190
183 scoped_refptr<base::SingleThreadTaskRunner> 191 scoped_refptr<base::SingleThreadTaskRunner>
184 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const { 192 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const {
185 return network_task_runner_; 193 return network_task_runner_;
186 } 194 }
187 195
188 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} 196 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {}
OLDNEW
« no previous file with comments | « chrome/browser/net/connection_tester_unittest.cc ('k') | net/url_request/url_request_context_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698