diff options
| author | dcheng <dcheng@chromium.org> | 2014-09-03 17:13:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 00:34:42 +0000 |
| commit | 707f860a000925a096b2631be0052affa1b1aec6 (patch) | |
| tree | cb143fb8ef55b25057c889ff38530f2e7e1061b1 /net/socket | |
| parent | 012b3711f9b51af158598adc2f65e8b667f975a3 (diff) | |
| download | chromium_src-707f860a000925a096b2631be0052affa1b1aec6.zip chromium_src-707f860a000925a096b2631be0052affa1b1aec6.tar.gz chromium_src-707f860a000925a096b2631be0052affa1b1aec6.tar.bz2 | |
Reland net-related fixups for scoped_refptr conversion operator cleanup.
BUG=110610
TBR=mmenke@chromium.org,pkasting@chromium.org,rsleevi@chromium.org
Review URL: https://codereview.chromium.org/536053003
Cr-Commit-Position: refs/heads/master@{#293231}
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 2 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 24 |
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; } |