OLD | NEW |
1 // Copyright (c) 2011 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 "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/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
(...skipping 29 matching lines...) Expand all Loading... |
41 net::NetLog::SOURCE_SOCKET)), | 41 net::NetLog::SOURCE_SOCKET)), |
42 ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { | 42 ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { |
43 DCHECK(request_context_getter); | 43 DCHECK(request_context_getter); |
44 net::URLRequestContext* request_context = | 44 net::URLRequestContext* request_context = |
45 request_context_getter->GetURLRequestContext(); | 45 request_context_getter->GetURLRequestContext(); |
46 DCHECK(request_context); | 46 DCHECK(request_context); |
47 net::HttpNetworkSession::Params session_params; | 47 net::HttpNetworkSession::Params session_params; |
48 session_params.client_socket_factory = socket_factory; | 48 session_params.client_socket_factory = socket_factory; |
49 session_params.host_resolver = request_context->host_resolver(); | 49 session_params.host_resolver = request_context->host_resolver(); |
50 session_params.cert_verifier = request_context->cert_verifier(); | 50 session_params.cert_verifier = request_context->cert_verifier(); |
51 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe. | 51 // TODO(rkn): This is NULL because ServerBoundCertService is not thread safe. |
52 session_params.origin_bound_cert_service = NULL; | 52 session_params.server_bound_cert_service = NULL; |
53 // transport_security_state is NULL because it's not thread safe. | 53 // transport_security_state is NULL because it's not thread safe. |
54 session_params.transport_security_state = NULL; | 54 session_params.transport_security_state = NULL; |
55 session_params.proxy_service = request_context->proxy_service(); | 55 session_params.proxy_service = request_context->proxy_service(); |
56 session_params.ssl_host_info_factory = NULL; | 56 session_params.ssl_host_info_factory = NULL; |
57 session_params.ssl_config_service = request_context->ssl_config_service(); | 57 session_params.ssl_config_service = request_context->ssl_config_service(); |
58 session_params.http_auth_handler_factory = | 58 session_params.http_auth_handler_factory = |
59 request_context->http_auth_handler_factory(); | 59 request_context->http_auth_handler_factory(); |
60 session_params.network_delegate = request_context->network_delegate(); | 60 session_params.network_delegate = request_context->network_delegate(); |
61 session_params.http_server_properties = | 61 session_params.http_server_properties = |
62 request_context->http_server_properties(); | 62 request_context->http_server_properties(); |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 return base::TimeDelta::FromMicroseconds(-1); | 366 return base::TimeDelta::FromMicroseconds(-1); |
367 } | 367 } |
368 | 368 |
369 void ProxyResolvingClientSocket::CloseTransportSocket() { | 369 void ProxyResolvingClientSocket::CloseTransportSocket() { |
370 if (transport_.get() && transport_->socket()) | 370 if (transport_.get() && transport_->socket()) |
371 transport_->socket()->Disconnect(); | 371 transport_->socket()->Disconnect(); |
372 transport_.reset(); | 372 transport_.reset(); |
373 } | 373 } |
374 | 374 |
375 } // namespace notifier | 375 } // namespace notifier |
OLD | NEW |