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

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

Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 media_request_context_->set_http_server_properties(http_server_properties()); 278 media_request_context_->set_http_server_properties(http_server_properties());
279 279
280 main_context->set_host_resolver( 280 main_context->set_host_resolver(
281 io_thread_globals->host_resolver.get()); 281 io_thread_globals->host_resolver.get());
282 media_request_context_->set_host_resolver( 282 media_request_context_->set_host_resolver(
283 io_thread_globals->host_resolver.get()); 283 io_thread_globals->host_resolver.get());
284 main_context->set_cert_verifier( 284 main_context->set_cert_verifier(
285 io_thread_globals->cert_verifier.get()); 285 io_thread_globals->cert_verifier.get());
286 media_request_context_->set_cert_verifier( 286 media_request_context_->set_cert_verifier(
287 io_thread_globals->cert_verifier.get()); 287 io_thread_globals->cert_verifier.get());
288 main_context->set_dnsrr_resolver(
289 io_thread_globals->dnsrr_resolver.get());
290 media_request_context_->set_dnsrr_resolver(
291 io_thread_globals->dnsrr_resolver.get());
292 main_context->set_http_auth_handler_factory( 288 main_context->set_http_auth_handler_factory(
293 io_thread_globals->http_auth_handler_factory.get()); 289 io_thread_globals->http_auth_handler_factory.get());
294 media_request_context_->set_http_auth_handler_factory( 290 media_request_context_->set_http_auth_handler_factory(
295 io_thread_globals->http_auth_handler_factory.get()); 291 io_thread_globals->http_auth_handler_factory.get());
296 292
297 main_context->set_dns_cert_checker(dns_cert_checker()); 293 main_context->set_dns_cert_checker(dns_cert_checker());
298 main_context->set_fraudulent_certificate_reporter( 294 main_context->set_fraudulent_certificate_reporter(
299 fraudulent_certificate_reporter()); 295 fraudulent_certificate_reporter());
300 media_request_context_->set_dns_cert_checker(dns_cert_checker()); 296 media_request_context_->set_dns_cert_checker(dns_cert_checker());
301 media_request_context_->set_fraudulent_certificate_reporter( 297 media_request_context_->set_fraudulent_certificate_reporter(
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 net::HttpCache::DefaultBackend* main_backend = 362 net::HttpCache::DefaultBackend* main_backend =
367 new net::HttpCache::DefaultBackend( 363 new net::HttpCache::DefaultBackend(
368 net::DISK_CACHE, 364 net::DISK_CACHE,
369 lazy_params_->cache_path, 365 lazy_params_->cache_path,
370 lazy_params_->cache_max_size, 366 lazy_params_->cache_max_size,
371 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)); 367 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
372 net::HttpCache* main_cache = new net::HttpCache( 368 net::HttpCache* main_cache = new net::HttpCache(
373 main_context->host_resolver(), 369 main_context->host_resolver(),
374 main_context->cert_verifier(), 370 main_context->cert_verifier(),
375 main_context->origin_bound_cert_service(), 371 main_context->origin_bound_cert_service(),
376 main_context->dnsrr_resolver(), 372 main_context->transport_security_state(),
377 main_context->dns_cert_checker(), 373 main_context->dns_cert_checker(),
378 main_context->proxy_service(), 374 main_context->proxy_service(),
379 main_context->ssl_config_service(), 375 main_context->ssl_config_service(),
380 main_context->http_auth_handler_factory(), 376 main_context->http_auth_handler_factory(),
381 main_context->network_delegate(), 377 main_context->network_delegate(),
382 main_context->http_server_properties(), 378 main_context->http_server_properties(),
383 main_context->net_log(), 379 main_context->net_log(),
384 main_backend); 380 main_backend);
385 381
386 net::HttpCache::DefaultBackend* media_backend = 382 net::HttpCache::DefaultBackend* media_backend =
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 scoped_refptr<ChromeURLRequestContext> 490 scoped_refptr<ChromeURLRequestContext>
495 ProfileImplIOData::AcquireIsolatedAppRequestContext( 491 ProfileImplIOData::AcquireIsolatedAppRequestContext(
496 scoped_refptr<ChromeURLRequestContext> main_context, 492 scoped_refptr<ChromeURLRequestContext> main_context,
497 const std::string& app_id) const { 493 const std::string& app_id) const {
498 // We create per-app contexts on demand, unlike the others above. 494 // We create per-app contexts on demand, unlike the others above.
499 scoped_refptr<ChromeURLRequestContext> app_request_context = 495 scoped_refptr<ChromeURLRequestContext> app_request_context =
500 InitializeAppRequestContext(main_context, app_id); 496 InitializeAppRequestContext(main_context, app_id);
501 DCHECK(app_request_context); 497 DCHECK(app_request_context);
502 return app_request_context; 498 return app_request_context;
503 } 499 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/service/net/service_url_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698