Rework the logging for sockets/connectjobs....

net/socket/socks_client_socket_pool_unittest.cc

 // Copyright (c) 2010 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/socks_client_socket_pool.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 69 matching lines @@
     CompletionCallbackImpl<MockConnectJob> connect_callback_;
 
     DISALLOW_COPY_AND_ASSIGN(MockConnectJob);
   };
 
   MockTCPClientSocketPool(int max_sockets, int max_sockets_per_group,
       const scoped_refptr<ClientSocketPoolHistograms>& histograms,
       ClientSocketFactory* socket_factory,
       NetworkChangeNotifier* network_change_notifier)
       : TCPClientSocketPool(max_sockets, max_sockets_per_group, histograms,
-                            NULL, NULL, network_change_notifier),
+                            NULL, NULL, network_change_notifier, NULL),
         client_socket_factory_(socket_factory),
         release_count_(0),
         cancel_count_(0) {}
 
   int release_count() { return release_count_; };
   int cancel_count() { return cancel_count_; };
 
   // TCPClientSocketPool methods.
   virtual int RequestSocket(const std::string& group_name,
                             const void* socket_params,
@@ skipping 72 matching lines @@
         tcp_histograms_(new ClientSocketPoolHistograms("MockTCP")),
         tcp_socket_pool_(new MockTCPClientSocketPool(
             kMaxSockets, kMaxSocketsPerGroup, tcp_histograms_,
             &tcp_client_socket_factory_, &tcp_notifier_)),
         ignored_socket_params_(ignored_tcp_socket_params_, true,
                                HostPortPair("host", 80),
                                MEDIUM, GURL()),
         socks_histograms_(new ClientSocketPoolHistograms("SOCKSUnitTest")),
         pool_(new SOCKSClientSocketPool(
             kMaxSockets, kMaxSocketsPerGroup, socks_histograms_, NULL,
-            tcp_socket_pool_, &socks_notifier_)) {
+            tcp_socket_pool_, &socks_notifier_, NULL)) {
   }
 
   int StartRequest(const std::string& group_name, RequestPriority priority) {
     return StartRequestUsingPool(
         pool_, group_name, priority, ignored_socket_params_);
   }
 
   TCPSocketParams ignored_tcp_socket_params_;
   scoped_refptr<ClientSocketPoolHistograms> tcp_histograms_;
   MockClientSocketFactory tcp_client_socket_factory_;
@@ skipping 175 matching lines @@
 
   requests_[0]->handle()->Reset();
   requests_[1]->handle()->Reset();
 }
 
 // It would be nice to also test the timeouts in SOCKSClientSocketPool.
 
 }  // namespace
 
 }  // namespace net