Returning scoped_ptr instead of raw pointer in SocketPoolInfoToValue() in net/

net/socket/client_socket_pool_manager_impl.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/client_socket_pool_manager_impl.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_proxy_client_socket_pool.h"
@@ skipping 306 matching lines @@
       GetSocketPoolForHTTPProxy(proxy_server), ssl_config_service_.get(),
       net_log_);
 
   std::pair<SSLSocketPoolMap::iterator, bool> ret =
       ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server,
                                                           new_pool));
 
   return ret.first->second;
 }
 
-base::Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const {
-  base::ListValue* list = new base::ListValue();
+scoped_ptr<base::Value> ClientSocketPoolManagerImpl::SocketPoolInfoToValue()
+    const {
+  scoped_ptr<base::ListValue> list(new base::ListValue());
   list->Append(transport_socket_pool_->GetInfoAsValue("transport_socket_pool",
                                                 "transport_socket_pool",
                                                 false));
   // Third parameter is false because |ssl_socket_pool_| uses
   // |transport_socket_pool_| internally, and do not want to add it a second
   // time.
   list->Append(ssl_socket_pool_->GetInfoAsValue("ssl_socket_pool",
                                                 "ssl_socket_pool",
                                                 false));
-  AddSocketPoolsToList(list,
-                       http_proxy_socket_pools_,
-                       "http_proxy_socket_pool",
-                       true);
-  AddSocketPoolsToList(list,
-                       socks_socket_pools_,
-                       "socks_socket_pool",
+  AddSocketPoolsToList(list.get(), http_proxy_socket_pools_,
+                       "http_proxy_socket_pool", true);
+  AddSocketPoolsToList(list.get(), socks_socket_pools_, "socks_socket_pool",
                        true);
 
   // Third parameter is false because |ssl_socket_pools_for_proxies_| use
   // socket pools in |http_proxy_socket_pools_| and |socks_socket_pools_|.
-  AddSocketPoolsToList(list,
-                       ssl_socket_pools_for_proxies_,
-                       "ssl_socket_pool_for_proxies",
-                       false);
-  return list;
+  AddSocketPoolsToList(list.get(), ssl_socket_pools_for_proxies_,
+                       "ssl_socket_pool_for_proxies", false);
+  return list.Pass();
 }
 
 void ClientSocketPoolManagerImpl::OnCertAdded(const X509Certificate* cert) {
   FlushSocketPoolsWithError(ERR_NETWORK_CHANGED);
 }
 
 void ClientSocketPoolManagerImpl::OnCACertChanged(
     const X509Certificate* cert) {
   // We should flush the socket pools if we removed trust from a
   // cert, because a previously trusted server may have become
   // untrusted.
   //
   // We should not flush the socket pools if we added trust to a
   // cert.
   //
   // Since the OnCACertChanged method doesn't tell us what
   // kind of change it is, we have to flush the socket
   // pools to be safe.
   FlushSocketPoolsWithError(ERR_NETWORK_CHANGED);
 }
 
 }  // namespace net