| OLD | NEW |
| 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/debug/leak_tracker.h" | 10 #include "base/debug/leak_tracker.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 #include "net/base/mapped_host_resolver.h" | 41 #include "net/base/mapped_host_resolver.h" |
| 42 #include "net/base/net_util.h" | 42 #include "net/base/net_util.h" |
| 43 #include "net/ftp/ftp_network_layer.h" | 43 #include "net/ftp/ftp_network_layer.h" |
| 44 #include "net/http/http_auth_filter.h" | 44 #include "net/http/http_auth_filter.h" |
| 45 #include "net/http/http_auth_handler_factory.h" | 45 #include "net/http/http_auth_handler_factory.h" |
| 46 #include "net/http/http_network_layer.h" | 46 #include "net/http/http_network_layer.h" |
| 47 #include "net/http/http_network_session.h" | 47 #include "net/http/http_network_session.h" |
| 48 #include "net/proxy/proxy_config_service.h" | 48 #include "net/proxy/proxy_config_service.h" |
| 49 #include "net/proxy/proxy_script_fetcher_impl.h" | 49 #include "net/proxy/proxy_script_fetcher_impl.h" |
| 50 #include "net/proxy/proxy_service.h" | 50 #include "net/proxy/proxy_service.h" |
| 51 #include "net/socket/dns_cert_provenance_checker.h" |
| 51 #include "webkit/glue/webkit_glue.h" | 52 #include "webkit/glue/webkit_glue.h" |
| 52 | 53 |
| 53 #if defined(USE_NSS) | 54 #if defined(USE_NSS) |
| 54 #include "net/ocsp/nss_ocsp.h" | 55 #include "net/ocsp/nss_ocsp.h" |
| 55 #endif // defined(USE_NSS) | 56 #endif // defined(USE_NSS) |
| 56 | 57 |
| 57 namespace { | 58 namespace { |
| 58 | 59 |
| 59 // Custom URLRequestContext used by requests which aren't associated with a | 60 // Custom URLRequestContext used by requests which aren't associated with a |
| 60 // particular profile. We need to use a subclass of URLRequestContext in order | 61 // particular profile. We need to use a subclass of URLRequestContext in order |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 system_params.network_delegate = globals_->system_network_delegate.get(); | 690 system_params.network_delegate = globals_->system_network_delegate.get(); |
| 690 system_params.net_log = net_log_; | 691 system_params.net_log = net_log_; |
| 691 globals_->system_http_transaction_factory.reset( | 692 globals_->system_http_transaction_factory.reset( |
| 692 new net::HttpNetworkLayer( | 693 new net::HttpNetworkLayer( |
| 693 new net::HttpNetworkSession(system_params))); | 694 new net::HttpNetworkSession(system_params))); |
| 694 globals_->system_ftp_transaction_factory.reset( | 695 globals_->system_ftp_transaction_factory.reset( |
| 695 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 696 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 696 globals_->system_request_context = | 697 globals_->system_request_context = |
| 697 ConstructSystemRequestContext(globals_, net_log_); | 698 ConstructSystemRequestContext(globals_, net_log_); |
| 698 } | 699 } |
| OLD | NEW |