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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_io_data.cc

Issue 9617039: Change Origin bound certs -> Domain bound certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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/browser/profiles/off_the_record_profile_io_data.h" 5 #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 main_context->set_http_auth_handler_factory( 187 main_context->set_http_auth_handler_factory(
188 io_thread_globals->http_auth_handler_factory.get()); 188 io_thread_globals->http_auth_handler_factory.get());
189 main_context->set_fraudulent_certificate_reporter( 189 main_context->set_fraudulent_certificate_reporter(
190 fraudulent_certificate_reporter()); 190 fraudulent_certificate_reporter());
191 main_context->set_proxy_service(proxy_service()); 191 main_context->set_proxy_service(proxy_service());
192 192
193 // For incognito, we use the default non-persistent HttpServerPropertiesImpl. 193 // For incognito, we use the default non-persistent HttpServerPropertiesImpl.
194 http_server_properties_.reset(new net::HttpServerPropertiesImpl); 194 http_server_properties_.reset(new net::HttpServerPropertiesImpl);
195 main_context->set_http_server_properties(http_server_properties_.get()); 195 main_context->set_http_server_properties(http_server_properties_.get());
196 196
197 // For incognito, we use a non-persistent origin bound cert store. 197 // For incognito, we use a non-persistent server bound cert store.
198 net::OriginBoundCertService* origin_bound_cert_service = 198 net::ServerBoundCertService* server_bound_cert_service =
199 new net::OriginBoundCertService( 199 new net::ServerBoundCertService(
200 new net::DefaultOriginBoundCertStore(NULL)); 200 new net::DefaultServerBoundCertStore(NULL));
201 set_origin_bound_cert_service(origin_bound_cert_service); 201 set_server_bound_cert_service(server_bound_cert_service);
202 main_context->set_origin_bound_cert_service(origin_bound_cert_service); 202 main_context->set_server_bound_cert_service(server_bound_cert_service);
203 203
204 main_context->set_cookie_store( 204 main_context->set_cookie_store(
205 new net::CookieMonster(NULL, profile_params->cookie_monster_delegate)); 205 new net::CookieMonster(NULL, profile_params->cookie_monster_delegate));
206 // All we care about for extensions is the cookie store. For incognito, we 206 // All we care about for extensions is the cookie store. For incognito, we
207 // use a non-persistent cookie store. 207 // use a non-persistent cookie store.
208 208
209 net::CookieMonster* extensions_cookie_store = 209 net::CookieMonster* extensions_cookie_store =
210 new net::CookieMonster(NULL, NULL); 210 new net::CookieMonster(NULL, NULL);
211 // Enable cookies for devtools and extension URLs. 211 // Enable cookies for devtools and extension URLs.
212 const char* schemes[] = {chrome::kChromeDevToolsScheme, 212 const char* schemes[] = {chrome::kChromeDevToolsScheme,
213 chrome::kExtensionScheme}; 213 chrome::kExtensionScheme};
214 extensions_cookie_store->SetCookieableSchemes(schemes, 2); 214 extensions_cookie_store->SetCookieableSchemes(schemes, 2);
215 extensions_context->set_cookie_store(extensions_cookie_store); 215 extensions_context->set_cookie_store(extensions_cookie_store);
216 216
217 net::HttpCache::BackendFactory* main_backend = 217 net::HttpCache::BackendFactory* main_backend =
218 net::HttpCache::DefaultBackend::InMemory(0); 218 net::HttpCache::DefaultBackend::InMemory(0);
219 net::HttpCache* cache = 219 net::HttpCache* cache =
220 new net::HttpCache(main_context->host_resolver(), 220 new net::HttpCache(main_context->host_resolver(),
221 main_context->cert_verifier(), 221 main_context->cert_verifier(),
222 main_context->origin_bound_cert_service(), 222 main_context->server_bound_cert_service(),
223 main_context->transport_security_state(), 223 main_context->transport_security_state(),
224 main_context->proxy_service(), 224 main_context->proxy_service(),
225 GetSSLSessionCacheShard(), 225 GetSSLSessionCacheShard(),
226 main_context->ssl_config_service(), 226 main_context->ssl_config_service(),
227 main_context->http_auth_handler_factory(), 227 main_context->http_auth_handler_factory(),
228 main_context->network_delegate(), 228 main_context->network_delegate(),
229 main_context->http_server_properties(), 229 main_context->http_server_properties(),
230 main_context->net_log(), 230 main_context->net_log(),
231 main_backend); 231 main_backend);
232 232
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 scoped_refptr<ChromeURLRequestContext> 278 scoped_refptr<ChromeURLRequestContext>
279 OffTheRecordProfileIOData::AcquireIsolatedAppRequestContext( 279 OffTheRecordProfileIOData::AcquireIsolatedAppRequestContext(
280 scoped_refptr<ChromeURLRequestContext> main_context, 280 scoped_refptr<ChromeURLRequestContext> main_context,
281 const std::string& app_id) const { 281 const std::string& app_id) const {
282 // We create per-app contexts on demand, unlike the others above. 282 // We create per-app contexts on demand, unlike the others above.
283 scoped_refptr<ChromeURLRequestContext> app_request_context = 283 scoped_refptr<ChromeURLRequestContext> app_request_context =
284 InitializeAppRequestContext(main_context, app_id); 284 InitializeAppRequestContext(main_context, app_id);
285 DCHECK(app_request_context); 285 DCHECK(app_request_context);
286 return app_request_context; 286 return app_request_context;
287 } 287 }
OLDNEW
« no previous file with comments | « chrome/browser/net/ssl_config_service_manager_pref.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698