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 "jingle/notifier/base/proxy_resolving_client_socket.h" | 5 #include "jingle/notifier/base/proxy_resolving_client_socket.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 request_context_getter->GetURLRequestContext(); | 42 request_context_getter->GetURLRequestContext(); |
43 DCHECK(request_context); | 43 DCHECK(request_context); |
44 net::HttpNetworkSession::Params session_params; | 44 net::HttpNetworkSession::Params session_params; |
45 session_params.client_socket_factory = socket_factory; | 45 session_params.client_socket_factory = socket_factory; |
46 session_params.host_resolver = request_context->host_resolver(); | 46 session_params.host_resolver = request_context->host_resolver(); |
47 session_params.cert_verifier = request_context->cert_verifier(); | 47 session_params.cert_verifier = request_context->cert_verifier(); |
48 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe. | 48 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe. |
49 session_params.origin_bound_cert_service = NULL; | 49 session_params.origin_bound_cert_service = NULL; |
50 // transport_security_state is NULL because it's not thread safe. | 50 // transport_security_state is NULL because it's not thread safe. |
51 session_params.transport_security_state = NULL; | 51 session_params.transport_security_state = NULL; |
52 session_params.dns_cert_checker = request_context->dns_cert_checker(); | |
53 session_params.proxy_service = request_context->proxy_service(); | 52 session_params.proxy_service = request_context->proxy_service(); |
54 session_params.ssl_host_info_factory = NULL; | 53 session_params.ssl_host_info_factory = NULL; |
55 session_params.ssl_config_service = request_context->ssl_config_service(); | 54 session_params.ssl_config_service = request_context->ssl_config_service(); |
56 session_params.http_auth_handler_factory = | 55 session_params.http_auth_handler_factory = |
57 request_context->http_auth_handler_factory(); | 56 request_context->http_auth_handler_factory(); |
58 session_params.network_delegate = request_context->network_delegate(); | 57 session_params.network_delegate = request_context->network_delegate(); |
59 session_params.http_server_properties = | 58 session_params.http_server_properties = |
60 request_context->http_server_properties(); | 59 request_context->http_server_properties(); |
61 session_params.net_log = request_context->net_log(); | 60 session_params.net_log = request_context->net_log(); |
62 network_session_ = new net::HttpNetworkSession(session_params); | 61 network_session_ = new net::HttpNetworkSession(session_params); |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 return base::TimeDelta::FromMicroseconds(-1); | 369 return base::TimeDelta::FromMicroseconds(-1); |
371 } | 370 } |
372 | 371 |
373 void ProxyResolvingClientSocket::CloseTransportSocket() { | 372 void ProxyResolvingClientSocket::CloseTransportSocket() { |
374 if (transport_.get() && transport_->socket()) | 373 if (transport_.get() && transport_->socket()) |
375 transport_->socket()->Disconnect(); | 374 transport_->socket()->Disconnect(); |
376 transport_.reset(); | 375 transport_.reset(); |
377 } | 376 } |
378 | 377 |
379 } // namespace notifier | 378 } // namespace notifier |
OLD | NEW |