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

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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 media_request_context_->set_http_server_properties(http_server_properties()); 276 media_request_context_->set_http_server_properties(http_server_properties());
277 277
278 main_context->set_host_resolver( 278 main_context->set_host_resolver(
279 io_thread_globals->host_resolver.get()); 279 io_thread_globals->host_resolver.get());
280 media_request_context_->set_host_resolver( 280 media_request_context_->set_host_resolver(
281 io_thread_globals->host_resolver.get()); 281 io_thread_globals->host_resolver.get());
282 main_context->set_cert_verifier( 282 main_context->set_cert_verifier(
283 io_thread_globals->cert_verifier.get()); 283 io_thread_globals->cert_verifier.get());
284 media_request_context_->set_cert_verifier( 284 media_request_context_->set_cert_verifier(
285 io_thread_globals->cert_verifier.get()); 285 io_thread_globals->cert_verifier.get());
286 main_context->set_dnsrr_resolver(
287 io_thread_globals->dnsrr_resolver.get());
288 media_request_context_->set_dnsrr_resolver(
289 io_thread_globals->dnsrr_resolver.get());
290 main_context->set_http_auth_handler_factory( 286 main_context->set_http_auth_handler_factory(
291 io_thread_globals->http_auth_handler_factory.get()); 287 io_thread_globals->http_auth_handler_factory.get());
292 media_request_context_->set_http_auth_handler_factory( 288 media_request_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 290
295 main_context->set_dns_cert_checker(dns_cert_checker()); 291 main_context->set_dns_cert_checker(dns_cert_checker());
296 main_context->set_fraudulent_certificate_reporter( 292 main_context->set_fraudulent_certificate_reporter(
297 fraudulent_certificate_reporter()); 293 fraudulent_certificate_reporter());
298 media_request_context_->set_dns_cert_checker(dns_cert_checker()); 294 media_request_context_->set_dns_cert_checker(dns_cert_checker());
299 media_request_context_->set_fraudulent_certificate_reporter( 295 media_request_context_->set_fraudulent_certificate_reporter(
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 net::HttpCache::DefaultBackend* main_backend = 355 net::HttpCache::DefaultBackend* main_backend =
360 new net::HttpCache::DefaultBackend( 356 new net::HttpCache::DefaultBackend(
361 net::DISK_CACHE, 357 net::DISK_CACHE,
362 lazy_params_->cache_path, 358 lazy_params_->cache_path,
363 lazy_params_->cache_max_size, 359 lazy_params_->cache_max_size,
364 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)); 360 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
365 net::HttpCache* main_cache = new net::HttpCache( 361 net::HttpCache* main_cache = new net::HttpCache(
366 main_context->host_resolver(), 362 main_context->host_resolver(),
367 main_context->cert_verifier(), 363 main_context->cert_verifier(),
368 main_context->origin_bound_cert_service(), 364 main_context->origin_bound_cert_service(),
369 main_context->dnsrr_resolver(), 365 main_context->transport_security_state(),
370 main_context->dns_cert_checker(), 366 main_context->dns_cert_checker(),
371 main_context->proxy_service(), 367 main_context->proxy_service(),
372 main_context->ssl_config_service(), 368 main_context->ssl_config_service(),
373 main_context->http_auth_handler_factory(), 369 main_context->http_auth_handler_factory(),
374 main_context->network_delegate(), 370 main_context->network_delegate(),
375 main_context->http_server_properties(), 371 main_context->http_server_properties(),
376 main_context->net_log(), 372 main_context->net_log(),
377 main_backend); 373 main_backend);
378 374
379 net::HttpCache::DefaultBackend* media_backend = 375 net::HttpCache::DefaultBackend* media_backend =
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 scoped_refptr<ChromeURLRequestContext> 483 scoped_refptr<ChromeURLRequestContext>
488 ProfileImplIOData::AcquireIsolatedAppRequestContext( 484 ProfileImplIOData::AcquireIsolatedAppRequestContext(
489 scoped_refptr<ChromeURLRequestContext> main_context, 485 scoped_refptr<ChromeURLRequestContext> main_context,
490 const std::string& app_id) const { 486 const std::string& app_id) const {
491 // We create per-app contexts on demand, unlike the others above. 487 // We create per-app contexts on demand, unlike the others above.
492 scoped_refptr<ChromeURLRequestContext> app_request_context = 488 scoped_refptr<ChromeURLRequestContext> app_request_context =
493 InitializeAppRequestContext(main_context, app_id); 489 InitializeAppRequestContext(main_context, app_id);
494 DCHECK(app_request_context); 490 DCHECK(app_request_context);
495 return app_request_context; 491 return app_request_context;
496 } 492 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698