Clean up a few unused globals.

net/dns/dns_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/dns/dns_socket_pool.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "net/base/address_list.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/rand_callback.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/stream_socket.h"
 #include "net/udp/datagram_client_socket.h"
 
 namespace net {
 
 namespace {
 
 // When we initialize the SocketPool, we allocate kInitialPoolSize sockets.
 // When we allocate a socket, we ensure we have at least kAllocateMinSize
-// sockets to choose from.  When we free a socket, we retain it if we have
-// less than kRetainMaxSize sockets in the pool.
+// sockets to choose from.  Freed sockets are not retained.
 
 // On Windows, we can't request specific (random) ports, since that will
 // trigger firewall prompts, so request default ones, but keep a pile of
 // them.  Everywhere else, request fresh, random ports each time.
 #if defined(OS_WIN)
 const DatagramSocket::BindType kBindType = DatagramSocket::DEFAULT_BIND;
 const unsigned kInitialPoolSize = 256;
 const unsigned kAllocateMinSize = 256;
-const unsigned kRetainMaxSize = 0;
 #else
 const DatagramSocket::BindType kBindType = DatagramSocket::RANDOM_BIND;
 const unsigned kInitialPoolSize = 0;
 const unsigned kAllocateMinSize = 1;
-const unsigned kRetainMaxSize = 0;
 #endif
 
 } // namespace
 
 DnsSocketPool::DnsSocketPool(ClientSocketFactory* socket_factory)
     : socket_factory_(socket_factory),
       net_log_(NULL),
       nameservers_(NULL),
       initialized_(false) {
 }
@@ skipping 151 matching lines @@
   pool[socket_index] = pool.back();
   pool.pop_back();
 
   return scoped_ptr<DatagramClientSocket>(socket);
 }
 
 void DefaultDnsSocketPool::FreeSocket(
     unsigned server_index,
     scoped_ptr<DatagramClientSocket> socket) {
   DCHECK_LT(server_index, pools_.size());
-
-  // In some builds, kRetainMaxSize will be 0 if we never reuse sockets.
-  // In that case, don't compile this code to avoid a "tautological
-  // comparison" warning from clang.
-#if kRetainMaxSize > 0
-  SocketVector& pool = pools_[server_index];
-  if (pool.size() < kRetainMaxSize)
-    pool.push_back(socket.release());
-#endif
 }
 
 void DefaultDnsSocketPool::FillPool(unsigned server_index, unsigned size) {
   SocketVector& pool = pools_[server_index];
 
   for (unsigned pool_index = pool.size(); pool_index < size; ++pool_index) {
     DatagramClientSocket* socket =
         CreateConnectedSocket(server_index).release();
     if (!socket)
       break;
     pool.push_back(socket);
   }
 }
 
 } // namespace net