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

Side by Side Diff: net/socket_stream/socket_stream.cc

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve merge conflict after rebase. Created 7 years, 6 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
OLDNEW
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 // TODO(ukai): code is similar with http_network_transaction.cc. We should 5 // TODO(ukai): code is similar with http_network_transaction.cc. We should
6 // think about ways to share code, if possible. 6 // think about ways to share code, if possible.
7 7
8 #include "net/socket_stream/socket_stream.h" 8 #include "net/socket_stream/socket_stream.h"
9 9
10 #include <set> 10 #include <set>
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 } else { 976 } else {
977 next_state_ = STATE_CLOSE; 977 next_state_ = STATE_CLOSE;
978 } 978 }
979 return result; 979 return result;
980 } 980 }
981 981
982 int SocketStream::DoSecureProxyConnect() { 982 int SocketStream::DoSecureProxyConnect() {
983 DCHECK(factory_); 983 DCHECK(factory_);
984 SSLClientSocketContext ssl_context; 984 SSLClientSocketContext ssl_context;
985 ssl_context.cert_verifier = context_->cert_verifier(); 985 ssl_context.cert_verifier = context_->cert_verifier();
986 ssl_context.transport_security_state = context_->transport_security_state();
986 ssl_context.server_bound_cert_service = context_->server_bound_cert_service(); 987 ssl_context.server_bound_cert_service = context_->server_bound_cert_service();
987 socket_.reset(factory_->CreateSSLClientSocket( 988 socket_.reset(factory_->CreateSSLClientSocket(
988 socket_.release(), 989 socket_.release(),
989 proxy_info_.proxy_server().host_port_pair(), 990 proxy_info_.proxy_server().host_port_pair(),
990 proxy_ssl_config_, 991 proxy_ssl_config_,
991 ssl_context)); 992 ssl_context));
992 next_state_ = STATE_SECURE_PROXY_CONNECT_COMPLETE; 993 next_state_ = STATE_SECURE_PROXY_CONNECT_COMPLETE;
993 metrics_->OnCountConnectionType(SocketStreamMetrics::SECURE_PROXY_CONNECTION); 994 metrics_->OnCountConnectionType(SocketStreamMetrics::SECURE_PROXY_CONNECTION);
994 return socket_->Connect(io_callback_); 995 return socket_->Connect(io_callback_);
995 } 996 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 } else { 1030 } else {
1030 next_state_ = STATE_CLOSE; 1031 next_state_ = STATE_CLOSE;
1031 } 1032 }
1032 return result; 1033 return result;
1033 } 1034 }
1034 1035
1035 int SocketStream::DoSSLConnect() { 1036 int SocketStream::DoSSLConnect() {
1036 DCHECK(factory_); 1037 DCHECK(factory_);
1037 SSLClientSocketContext ssl_context; 1038 SSLClientSocketContext ssl_context;
1038 ssl_context.cert_verifier = context_->cert_verifier(); 1039 ssl_context.cert_verifier = context_->cert_verifier();
1040 ssl_context.transport_security_state = context_->transport_security_state();
1039 ssl_context.server_bound_cert_service = context_->server_bound_cert_service(); 1041 ssl_context.server_bound_cert_service = context_->server_bound_cert_service();
1040 socket_.reset(factory_->CreateSSLClientSocket(socket_.release(), 1042 socket_.reset(factory_->CreateSSLClientSocket(socket_.release(),
1041 HostPortPair::FromURL(url_), 1043 HostPortPair::FromURL(url_),
1042 server_ssl_config_, 1044 server_ssl_config_,
1043 ssl_context)); 1045 ssl_context));
1044 next_state_ = STATE_SSL_CONNECT_COMPLETE; 1046 next_state_ = STATE_SSL_CONNECT_COMPLETE;
1045 metrics_->OnCountConnectionType(SocketStreamMetrics::SSL_CONNECTION); 1047 metrics_->OnCountConnectionType(SocketStreamMetrics::SSL_CONNECTION);
1046 return socket_->Connect(io_callback_); 1048 return socket_->Connect(io_callback_);
1047 } 1049 }
1048 1050
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 1315
1314 SSLConfigService* SocketStream::ssl_config_service() const { 1316 SSLConfigService* SocketStream::ssl_config_service() const {
1315 return context_->ssl_config_service(); 1317 return context_->ssl_config_service();
1316 } 1318 }
1317 1319
1318 ProxyService* SocketStream::proxy_service() const { 1320 ProxyService* SocketStream::proxy_service() const {
1319 return context_->proxy_service(); 1321 return context_->proxy_service();
1320 } 1322 }
1321 1323
1322 } // namespace net 1324 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698