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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "net/http/http_server_properties_impl.h" | 55 #include "net/http/http_server_properties_impl.h" |
56 #include "net/proxy/proxy_config_service.h" | 56 #include "net/proxy/proxy_config_service.h" |
57 #include "net/proxy/proxy_script_fetcher_impl.h" | 57 #include "net/proxy/proxy_script_fetcher_impl.h" |
58 #include "net/proxy/proxy_service.h" | 58 #include "net/proxy/proxy_service.h" |
59 #include "net/socket/dns_cert_provenance_checker.h" | 59 #include "net/socket/dns_cert_provenance_checker.h" |
60 | 60 |
61 #if defined(USE_NSS) | 61 #if defined(USE_NSS) |
62 #include "net/ocsp/nss_ocsp.h" | 62 #include "net/ocsp/nss_ocsp.h" |
63 #endif // defined(USE_NSS) | 63 #endif // defined(USE_NSS) |
64 | 64 |
| 65 using content::BrowserThread; |
| 66 |
65 namespace { | 67 namespace { |
66 | 68 |
67 // Custom URLRequestContext used by requests which aren't associated with a | 69 // Custom URLRequestContext used by requests which aren't associated with a |
68 // particular profile. We need to use a subclass of URLRequestContext in order | 70 // particular profile. We need to use a subclass of URLRequestContext in order |
69 // to provide the correct User-Agent. | 71 // to provide the correct User-Agent. |
70 class URLRequestContextWithUserAgent : public net::URLRequestContext { | 72 class URLRequestContextWithUserAgent : public net::URLRequestContext { |
71 public: | 73 public: |
72 virtual const std::string& GetUserAgent( | 74 virtual const std::string& GetUserAgent( |
73 const GURL& url) const OVERRIDE { | 75 const GURL& url) const OVERRIDE { |
74 return content::GetUserAgent(url); | 76 return content::GetUserAgent(url); |
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 system_params.network_delegate = globals_->system_network_delegate.get(); | 619 system_params.network_delegate = globals_->system_network_delegate.get(); |
618 system_params.net_log = net_log_; | 620 system_params.net_log = net_log_; |
619 globals_->system_http_transaction_factory.reset( | 621 globals_->system_http_transaction_factory.reset( |
620 new net::HttpNetworkLayer( | 622 new net::HttpNetworkLayer( |
621 new net::HttpNetworkSession(system_params))); | 623 new net::HttpNetworkSession(system_params))); |
622 globals_->system_ftp_transaction_factory.reset( | 624 globals_->system_ftp_transaction_factory.reset( |
623 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 625 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
624 globals_->system_request_context = | 626 globals_->system_request_context = |
625 ConstructSystemRequestContext(globals_, net_log_); | 627 ConstructSystemRequestContext(globals_, net_log_); |
626 } | 628 } |
OLD | NEW |