OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "remoting/host/url_request_context.h" | 5 #include "remoting/host/url_request_context.h" |
6 | 6 |
7 #include "base/message_loop_proxy.h" | 7 #include "base/message_loop_proxy.h" |
8 #include "net/base/cert_verifier.h" | 8 #include "net/base/cert_verifier.h" |
9 #include "net/base/host_resolver.h" | 9 #include "net/base/host_resolver.h" |
10 #include "net/base/ssl_config_service_defaults.h" | 10 #include "net/base/ssl_config_service_defaults.h" |
| 11 #include "net/base/transport_security_state.h" |
11 #include "net/http/http_auth_handler_factory.h" | 12 #include "net/http/http_auth_handler_factory.h" |
12 #include "net/http/http_network_layer.h" | 13 #include "net/http/http_network_layer.h" |
13 #include "net/http/http_network_session.h" | 14 #include "net/http/http_network_session.h" |
14 #include "net/http/http_server_properties_impl.h" | 15 #include "net/http/http_server_properties_impl.h" |
15 #include "net/proxy/proxy_config_service.h" | 16 #include "net/proxy/proxy_config_service.h" |
16 #include "net/proxy/proxy_service.h" | 17 #include "net/proxy/proxy_service.h" |
17 #include "remoting/host/vlog_net_log.h" | 18 #include "remoting/host/vlog_net_log.h" |
18 | 19 |
19 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
20 #include "net/proxy/proxy_config_service_win.h" | 21 #include "net/proxy/proxy_config_service_win.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, | 87 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, |
87 net::HostResolver::kDefaultRetryAttempts, | 88 net::HostResolver::kDefaultRetryAttempts, |
88 net_log.get())); | 89 net_log.get())); |
89 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( | 90 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( |
90 proxy_config_service.release(), 0u, net_log.get())); | 91 proxy_config_service.release(), 0u, net_log.get())); |
91 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); | 92 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); |
92 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 93 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
93 storage_.set_http_auth_handler_factory( | 94 storage_.set_http_auth_handler_factory( |
94 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 95 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
95 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); | 96 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); |
| 97 storage_.set_transport_security_state(new net::TransportSecurityState); |
96 | 98 |
97 net::HttpNetworkSession::Params session_params; | 99 net::HttpNetworkSession::Params session_params; |
98 session_params.host_resolver = host_resolver(); | 100 session_params.host_resolver = host_resolver(); |
99 session_params.cert_verifier = cert_verifier(); | 101 session_params.cert_verifier = cert_verifier(); |
100 session_params.proxy_service = proxy_service(); | 102 session_params.proxy_service = proxy_service(); |
101 session_params.ssl_config_service = ssl_config_service(); | 103 session_params.ssl_config_service = ssl_config_service(); |
102 session_params.http_auth_handler_factory = http_auth_handler_factory(); | 104 session_params.http_auth_handler_factory = http_auth_handler_factory(); |
103 session_params.http_server_properties = http_server_properties(); | 105 session_params.http_server_properties = http_server_properties(); |
104 session_params.net_log = net_log.get(); | 106 session_params.net_log = net_log.get(); |
105 scoped_refptr<net::HttpNetworkSession> network_session( | 107 scoped_refptr<net::HttpNetworkSession> network_session( |
(...skipping 25 matching lines...) Expand all Loading... |
131 | 133 |
132 scoped_refptr<base::SingleThreadTaskRunner> | 134 scoped_refptr<base::SingleThreadTaskRunner> |
133 URLRequestContextGetter::GetNetworkTaskRunner() const { | 135 URLRequestContextGetter::GetNetworkTaskRunner() const { |
134 return network_task_runner_; | 136 return network_task_runner_; |
135 } | 137 } |
136 | 138 |
137 URLRequestContextGetter::~URLRequestContextGetter() { | 139 URLRequestContextGetter::~URLRequestContextGetter() { |
138 } | 140 } |
139 | 141 |
140 } // namespace remoting | 142 } // namespace remoting |
OLD | NEW |