jingle/notifier/base/proxy_resolving_client_socket.cc - Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing.

Side by Side Diff: jingle/notifier/base/proxy_resolving_client_socket.cc

Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/service/net/service_url_request_context.cc ('k') | net/http/http_cache.h » ('j') | no next file with comments »

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 30 matching lines...) Expand all Loading...
41 DCHECK(request_context_getter);	41 DCHECK(request_context_getter);

42 net::URLRequestContext* request_context =	42 net::URLRequestContext* request_context =

43 request_context_getter->GetURLRequestContext();	43 request_context_getter->GetURLRequestContext();

44 DCHECK(request_context);	44 DCHECK(request_context);

45 net::HttpNetworkSession::Params session_params;	45 net::HttpNetworkSession::Params session_params;

46 session_params.client_socket_factory = socket_factory;	46 session_params.client_socket_factory = socket_factory;

47 session_params.host_resolver = request_context->host_resolver();	47 session_params.host_resolver = request_context->host_resolver();

48 session_params.cert_verifier = request_context->cert_verifier();	48 session_params.cert_verifier = request_context->cert_verifier();

49 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe.	49 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe.

50 session_params.origin_bound_cert_service = NULL;	50 session_params.origin_bound_cert_service = NULL;

51 session_params.dnsrr_resolver = request_context->dnsrr_resolver();	51 // transport_security_state is NULL because it's not thread safe.
	willchan no longer on Chromium 2011/12/05 21:22:26 I don't actually understand this comment. None of I don't actually understand this comment. None of the other stuff here is threadsafe either...did you just copy the comment or do you understand it?
	52 session_params.transport_security_state = NULL;

52 session_params.dns_cert_checker = request_context->dns_cert_checker();	53 session_params.dns_cert_checker = request_context->dns_cert_checker();

53 session_params.proxy_service = request_context->proxy_service();	54 session_params.proxy_service = request_context->proxy_service();

54 session_params.ssl_host_info_factory = NULL;	55 session_params.ssl_host_info_factory = NULL;

55 session_params.ssl_config_service = request_context->ssl_config_service();	56 session_params.ssl_config_service = request_context->ssl_config_service();

56 session_params.http_auth_handler_factory =	57 session_params.http_auth_handler_factory =

57 request_context->http_auth_handler_factory();	58 request_context->http_auth_handler_factory();

58 session_params.network_delegate = request_context->network_delegate();	59 session_params.network_delegate = request_context->network_delegate();

59 session_params.http_server_properties =	60 session_params.http_server_properties =

60 request_context->http_server_properties();	61 request_context->http_server_properties();

61 session_params.net_log = request_context->net_log();	62 session_params.net_log = request_context->net_log();

(...skipping 305 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
367 return base::TimeDelta::FromMicroseconds(-1);	368 return base::TimeDelta::FromMicroseconds(-1);

368 }	369 }

369	370

370 void ProxyResolvingClientSocket::CloseTransportSocket() {	371 void ProxyResolvingClientSocket::CloseTransportSocket() {

371 if (transport_.get() && transport_->socket())	372 if (transport_.get() && transport_->socket())

372 transport_->socket()->Disconnect();	373 transport_->socket()->Disconnect();

373 transport_.reset();	374 transport_.reset();

374 }	375 }

375	376

376 } // namespace notifier	377 } // namespace notifier

OLD	NEW