Remove experimental code to pick the "warmest" socket

net/socket/client_socket_pool_base.h

 // 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.
 //
 // A ClientSocketPoolBase is used to restrict the number of sockets open at
 // a time.  It also maintains a list of idle persistent sockets for reuse.
 // Subclasses of ClientSocketPool should compose ClientSocketPoolBase to handle
 // the core logic of (1) restricting the number of active (connected or
 // connecting) sockets per "group" (generally speaking, the hostname), (2)
 // maintaining a per-group list of idle, persistent sockets for reuse, and (3)
@@ skipping 12 matching lines @@
 #define NET_SOCKET_CLIENT_SOCKET_POOL_BASE_H_
 
 #include <deque>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"

[wtc, 2013/03/26 19:29:16]

Just curious: do you need to add this header, or is this
just for style reasons?

[mmenke, 2013/03/26 19:36:26]

I noticed it was missing, and added it.  It really shouldn't be in a "revert" CL
like this one, though, so I've now removed it.

 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/load_timing_info.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/request_priority.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/stream_socket.h"
 
 namespace net {
 
 class ClientSocketHandle;
 
-// Returns the client socket reuse policy.
-NET_EXPORT_PRIVATE int GetSocketReusePolicy();
-
-// Sets the client socket reuse policy.
-// NOTE: 'policy' should be a valid ClientSocketReusePolicy enum value.
-NET_EXPORT void SetSocketReusePolicy(int policy);
-
 // ConnectJob provides an abstract interface for "connecting" a socket.
 // The connection may involve host resolution, tcp connection, ssl connection,
 // etc.
 class NET_EXPORT_PRIVATE ConnectJob {
  public:
   class NET_EXPORT_PRIVATE Delegate {
    public:
     Delegate() {}
     virtual ~Delegate() {}
 
@@ skipping 83 matching lines @@
       public NetworkChangeNotifier::IPAddressObserver {
  public:
   typedef uint32 Flags;
 
   // Used to specify specific behavior for the ClientSocketPool.
   enum Flag {
     NORMAL = 0,  // Normal behavior.
     NO_IDLE_SOCKETS = 0x1,  // Do not return an idle socket. Create a new one.
   };
 
-  enum ClientSocketReusePolicy {
-    // Socket with largest amount of bytes transferred.
-    USE_WARMEST_SOCKET = 0,
-
-    // Socket which scores highest on large bytes transferred and low idle time.
-    USE_WARM_SOCKET = 1,
-
-    // Socket which was most recently used.
-    USE_LAST_ACCESSED_SOCKET = 2,
-  };
-
   class NET_EXPORT_PRIVATE Request {
    public:
     Request(ClientSocketHandle* handle,
             const CompletionCallback& callback,
             RequestPriority priority,
             bool ignore_limits,
             Flags flags,
             const BoundNetLog& net_log);
 
     virtual ~Request();
@@ skipping 629 matching lines @@
   // Histograms for the pool
   ClientSocketPoolHistograms* const histograms_;
   internal::ClientSocketPoolBaseHelper helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolBase);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_POOL_BASE_H_