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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 8944001: net: remove DNS certificate checking code. (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
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/net/chrome_dns_cert_provenance_checker.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "content/browser/gpu/gpu_process_host.h" 36 #include "content/browser/gpu/gpu_process_host.h"
37 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h" 37 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
38 #include "content/public/browser/browser_thread.h" 38 #include "content/public/browser/browser_thread.h"
39 #include "content/public/common/content_client.h" 39 #include "content/public/common/content_client.h"
40 #include "content/public/common/url_fetcher.h" 40 #include "content/public/common/url_fetcher.h"
41 #include "net/base/cert_verifier.h" 41 #include "net/base/cert_verifier.h"
42 #include "net/base/cookie_monster.h" 42 #include "net/base/cookie_monster.h"
43 #include "net/base/default_origin_bound_cert_store.h" 43 #include "net/base/default_origin_bound_cert_store.h"
44 #include "net/base/dnsrr_resolver.h"
45 #include "net/base/host_cache.h" 44 #include "net/base/host_cache.h"
46 #include "net/base/host_resolver.h" 45 #include "net/base/host_resolver.h"
47 #include "net/base/host_resolver_impl.h" 46 #include "net/base/host_resolver_impl.h"
48 #include "net/base/mapped_host_resolver.h" 47 #include "net/base/mapped_host_resolver.h"
49 #include "net/base/net_util.h" 48 #include "net/base/net_util.h"
50 #include "net/base/origin_bound_cert_service.h" 49 #include "net/base/origin_bound_cert_service.h"
51 #include "net/base/sdch_manager.h" 50 #include "net/base/sdch_manager.h"
52 #include "net/dns/async_host_resolver.h" 51 #include "net/dns/async_host_resolver.h"
53 #include "net/ftp/ftp_network_layer.h" 52 #include "net/ftp/ftp_network_layer.h"
54 #include "net/http/http_auth_filter.h" 53 #include "net/http/http_auth_filter.h"
55 #include "net/http/http_auth_handler_factory.h" 54 #include "net/http/http_auth_handler_factory.h"
56 #include "net/http/http_network_layer.h" 55 #include "net/http/http_network_layer.h"
57 #include "net/http/http_network_session.h" 56 #include "net/http/http_network_session.h"
58 #include "net/http/http_server_properties_impl.h" 57 #include "net/http/http_server_properties_impl.h"
59 #include "net/proxy/proxy_config_service.h" 58 #include "net/proxy/proxy_config_service.h"
60 #include "net/proxy/proxy_script_fetcher_impl.h" 59 #include "net/proxy/proxy_script_fetcher_impl.h"
61 #include "net/proxy/proxy_service.h" 60 #include "net/proxy/proxy_service.h"
62 #include "net/socket/dns_cert_provenance_checker.h"
63 61
64 #if defined(USE_NSS) 62 #if defined(USE_NSS)
65 #include "net/ocsp/nss_ocsp.h" 63 #include "net/ocsp/nss_ocsp.h"
66 #endif // defined(USE_NSS) 64 #endif // defined(USE_NSS)
67 65
68 #if defined(OS_CHROMEOS) 66 #if defined(OS_CHROMEOS)
69 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 67 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
70 #endif // defined(OS_CHROMEOS) 68 #endif // defined(OS_CHROMEOS)
71 69
72 using content::BrowserThread; 70 using content::BrowserThread;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 extension_event_router_forwarder_; 438 extension_event_router_forwarder_;
441 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( 439 globals_->system_network_delegate.reset(new ChromeNetworkDelegate(
442 extension_event_router_forwarder_, 440 extension_event_router_forwarder_,
443 NULL, 441 NULL,
444 NULL, 442 NULL,
445 NULL, 443 NULL,
446 &system_enable_referrers_)); 444 &system_enable_referrers_));
447 globals_->host_resolver.reset( 445 globals_->host_resolver.reset(
448 CreateGlobalHostResolver(net_log_)); 446 CreateGlobalHostResolver(net_log_));
449 globals_->cert_verifier.reset(new net::CertVerifier); 447 globals_->cert_verifier.reset(new net::CertVerifier);
450 globals_->dnsrr_resolver.reset(new net::DnsRRResolver);
451 globals_->transport_security_state.reset(new net::TransportSecurityState("")); 448 globals_->transport_security_state.reset(new net::TransportSecurityState(""));
452 globals_->ssl_config_service = GetSSLConfigService(); 449 globals_->ssl_config_service = GetSSLConfigService();
453 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( 450 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(
454 globals_->host_resolver.get())); 451 globals_->host_resolver.get()));
455 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); 452 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl);
456 // For the ProxyScriptFetcher, we use a direct ProxyService. 453 // For the ProxyScriptFetcher, we use a direct ProxyService.
457 globals_->proxy_script_fetcher_proxy_service.reset( 454 globals_->proxy_script_fetcher_proxy_service.reset(
458 net::ProxyService::CreateDirectWithNetLog(net_log_)); 455 net::ProxyService::CreateDirectWithNetLog(net_log_));
459 // In-memory cookie store. 456 // In-memory cookie store.
460 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); 457 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL);
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 globals_->proxy_script_fetcher_context, 653 globals_->proxy_script_fetcher_context,
657 system_proxy_config_service_.release(), 654 system_proxy_config_service_.release(),
658 command_line)); 655 command_line));
659 net::HttpNetworkSession::Params system_params; 656 net::HttpNetworkSession::Params system_params;
660 system_params.host_resolver = globals_->host_resolver.get(); 657 system_params.host_resolver = globals_->host_resolver.get();
661 system_params.cert_verifier = globals_->cert_verifier.get(); 658 system_params.cert_verifier = globals_->cert_verifier.get();
662 system_params.origin_bound_cert_service = 659 system_params.origin_bound_cert_service =
663 globals_->system_origin_bound_cert_service.get(); 660 globals_->system_origin_bound_cert_service.get();
664 system_params.transport_security_state = 661 system_params.transport_security_state =
665 globals_->transport_security_state.get(); 662 globals_->transport_security_state.get();
666 system_params.dns_cert_checker = NULL;
667 system_params.ssl_host_info_factory = NULL; 663 system_params.ssl_host_info_factory = NULL;
668 system_params.proxy_service = globals_->system_proxy_service.get(); 664 system_params.proxy_service = globals_->system_proxy_service.get();
669 system_params.ssl_config_service = globals_->ssl_config_service.get(); 665 system_params.ssl_config_service = globals_->ssl_config_service.get();
670 system_params.http_auth_handler_factory = 666 system_params.http_auth_handler_factory =
671 globals_->http_auth_handler_factory.get(); 667 globals_->http_auth_handler_factory.get();
672 system_params.http_server_properties = globals_->http_server_properties.get(); 668 system_params.http_server_properties = globals_->http_server_properties.get();
673 system_params.network_delegate = globals_->system_network_delegate.get(); 669 system_params.network_delegate = globals_->system_network_delegate.get();
674 system_params.net_log = net_log_; 670 system_params.net_log = net_log_;
675 globals_->system_http_transaction_factory.reset( 671 globals_->system_http_transaction_factory.reset(
676 new net::HttpNetworkLayer( 672 new net::HttpNetworkLayer(
677 new net::HttpNetworkSession(system_params))); 673 new net::HttpNetworkSession(system_params)));
678 globals_->system_ftp_transaction_factory.reset( 674 globals_->system_ftp_transaction_factory.reset(
679 new net::FtpNetworkLayer(globals_->host_resolver.get())); 675 new net::FtpNetworkLayer(globals_->host_resolver.get()));
680 globals_->system_request_context = 676 globals_->system_request_context =
681 ConstructSystemRequestContext(globals_, net_log_); 677 ConstructSystemRequestContext(globals_, net_log_);
682 } 678 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/net/chrome_dns_cert_provenance_checker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698