diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 00:39:50 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 00:39:50 +0000 |
| commit | 90499486eb26f12da3456f01bd28abc4a6191ea4 (patch) | |
| tree | aa97aa55048b94b328a11621f0dc73a2622c06e8 /net/socket/ssl_client_socket_pool.cc | |
| parent | a9030b828efc3b1312264875c1f76b35708eb000 (diff) | |
| download | chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.zip chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.gz chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.bz2 | |
Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15829004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index d4f5bda..e9b9ec5 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); } |