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

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.cc
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index d4f5bda03ac09404a675bb0d04dccbbdec92c8b7..e9b9ec5193408031fdc920b50725a63eeaeedef8 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -123,7 +123,7 @@ LoadState SSLConnectJob::GetLoadState() const {
void SSLConnectJob::GetAdditionalErrorState(ClientSocketHandle* handle) {
// Headers in |error_response_info_| indicate a proxy tunnel setup
// problem. See DoTunnelConnectComplete.
- if (error_response_info_.headers) {
+ if (error_response_info_.headers.get()) {
handle->set_pending_http_proxy_connection(
transport_socket_handle_.release());
}
@@ -383,7 +383,8 @@ int SSLConnectJob::DoSSLConnectComplete(int result) {
set_socket(ssl_socket_.release());
} else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
error_response_info_.cert_request_info = new SSLCertRequestInfo;
- ssl_socket_->GetSSLCertRequestInfo(error_response_info_.cert_request_info);
+ ssl_socket_->GetSSLCertRequestInfo(
+ error_response_info_.cert_request_info.get());
}
return result;
@@ -475,7 +476,7 @@ SSLClientSocketPool::SSLClientSocketPool(
ssl_session_cache_shard),
net_log)),
ssl_config_service_(ssl_config_service) {
- if (ssl_config_service_)
+ if (ssl_config_service_.get())
ssl_config_service_->AddObserver(this);
if (transport_pool_)
transport_pool_->AddLayeredPool(this);
@@ -492,7 +493,7 @@ SSLClientSocketPool::~SSLClientSocketPool() {
socks_pool_->RemoveLayeredPool(this);
if (transport_pool_)
transport_pool_->RemoveLayeredPool(this);
- if (ssl_config_service_)
+ if (ssl_config_service_.get())
ssl_config_service_->RemoveObserver(this);
}
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698