summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_openssl.cc2
-rw-r--r--net/socket/ssl_client_socket_pool.cc24
2 files changed, 13 insertions, 13 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 94dfdae..4eadb73 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -1540,7 +1540,7 @@ int SSLClientSocketOpenSSL::CertVerifyCallback(X509_STORE_CTX* store_ctx) {
CHECK(server_cert_.get());
PeerCertificateChain chain(store_ctx->untrusted);
- if (chain.IsValid() && server_cert_->Equals(chain.AsOSChain()))
+ if (chain.IsValid() && server_cert_->Equals(chain.AsOSChain().get()))
return 1;
if (!chain.IsValid())
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 2cc50e0..388e3fe 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -46,15 +46,15 @@ SSLSocketParams::SSLSocketParams(
force_spdy_over_ssl_(force_spdy_over_ssl),
want_spdy_over_npn_(want_spdy_over_npn),
ignore_limits_(false) {
- if (direct_params_) {
- DCHECK(!socks_proxy_params_);
- DCHECK(!http_proxy_params_);
+ if (direct_params_.get()) {
+ DCHECK(!socks_proxy_params_.get());
+ DCHECK(!http_proxy_params_.get());
ignore_limits_ = direct_params_->ignore_limits();
- } else if (socks_proxy_params_) {
- DCHECK(!http_proxy_params_);
+ } else if (socks_proxy_params_.get()) {
+ DCHECK(!http_proxy_params_.get());
ignore_limits_ = socks_proxy_params_->ignore_limits();
} else {
- DCHECK(http_proxy_params_);
+ DCHECK(http_proxy_params_.get());
ignore_limits_ = http_proxy_params_->ignore_limits();
}
}
@@ -62,18 +62,18 @@ SSLSocketParams::SSLSocketParams(
SSLSocketParams::~SSLSocketParams() {}
SSLSocketParams::ConnectionType SSLSocketParams::GetConnectionType() const {
- if (direct_params_) {
- DCHECK(!socks_proxy_params_);
- DCHECK(!http_proxy_params_);
+ if (direct_params_.get()) {
+ DCHECK(!socks_proxy_params_.get());
+ DCHECK(!http_proxy_params_.get());
return DIRECT;
}
- if (socks_proxy_params_) {
- DCHECK(!http_proxy_params_);
+ if (socks_proxy_params_.get()) {
+ DCHECK(!http_proxy_params_.get());
return SOCKS_PROXY;
}
- DCHECK(http_proxy_params_);
+ DCHECK(http_proxy_params_.get());
return HTTP_PROXY;
}