Net-related fixups for scoped_refptr conversion operator cleanup.

net/socket/ssl_client_socket_pool.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket_pool.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 28 matching lines @@
     : direct_params_(direct_params),
       socks_proxy_params_(socks_proxy_params),
       http_proxy_params_(http_proxy_params),
       host_and_port_(host_and_port),
       ssl_config_(ssl_config),
       privacy_mode_(privacy_mode),
       load_flags_(load_flags),
       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();
   }
 }
 
 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;
 }
 
 const scoped_refptr<TransportSocketParams>&
 SSLSocketParams::GetDirectConnectionParams() const {
   DCHECK_EQ(GetConnectionType(), DIRECT);
   return direct_params_;
 }
 
 const scoped_refptr<SOCKSSocketParams>&
@@ skipping 767 matching lines @@
   CHECK(it != messenger_map_.end());
   delete it->second;
   messenger_map_.erase(it);
 }
 
 void SSLClientSocketPool::OnSSLConfigChanged() {
   FlushWithError(ERR_NETWORK_CHANGED);
 }
 
 }  // namespace net