Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: net/socket/ssl_client_socket_pool.cc

Issue 7065045: Fix nits related to SSLHostInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months 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 | « net/http/disk_cache_based_ssl_host_info.cc ('k') | net/socket/ssl_host_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "net/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/metrics/field_trial.h" 7 #include "base/metrics/field_trial.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 if (ssl_host_info_factory_) { 195 if (ssl_host_info_factory_) {
196 ssl_host_info_.reset( 196 ssl_host_info_.reset(
197 ssl_host_info_factory_->GetForHost(params_->host_and_port().host(), 197 ssl_host_info_factory_->GetForHost(params_->host_and_port().host(),
198 params_->ssl_config())); 198 params_->ssl_config()));
199 } 199 }
200 200
201 if (ssl_host_info_.get()) { 201 if (ssl_host_info_.get()) {
202 if (dnsrr_resolver_) 202 if (dnsrr_resolver_)
203 ssl_host_info_->StartDnsLookup(dnsrr_resolver_); 203 ssl_host_info_->StartDnsLookup(dnsrr_resolver_);
204 204
205 // This starts fetching the SSL host info from the disk cache for Snap 205 // This starts fetching the SSL host info from the disk cache for early
206 // Start. 206 // certificate verification and the TLS cached information extension.
207 ssl_host_info_->Start(); 207 ssl_host_info_->Start();
208 } 208 }
209 209
210 next_state_ = STATE_TRANSPORT_CONNECT_COMPLETE; 210 next_state_ = STATE_TRANSPORT_CONNECT_COMPLETE;
211 transport_socket_handle_.reset(new ClientSocketHandle()); 211 transport_socket_handle_.reset(new ClientSocketHandle());
212 scoped_refptr<TransportSocketParams> transport_params = 212 scoped_refptr<TransportSocketParams> transport_params =
213 params_->transport_params(); 213 params_->transport_params();
214 return transport_socket_handle_->Init( 214 return transport_socket_handle_->Init(
215 group_name(), 215 group_name(),
216 transport_params, 216 transport_params,
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 573
574 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { 574 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const {
575 return base_.histograms(); 575 return base_.histograms();
576 } 576 }
577 577
578 void SSLClientSocketPool::OnSSLConfigChanged() { 578 void SSLClientSocketPool::OnSSLConfigChanged() {
579 Flush(); 579 Flush();
580 } 580 }
581 581
582 } // namespace net 582 } // namespace net
OLDNEW
« no previous file with comments | « net/http/disk_cache_based_ssl_host_info.cc ('k') | net/socket/ssl_host_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698