Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing...

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 181 matching lines @@
   MockNetworkChangeNotifier socks_notifier_;
   scoped_refptr<SOCKSClientSocketPool> pool_;
 };
 
 TEST_F(SOCKSClientSocketPoolTest, Simple) {
   SOCKS5MockData data(false);
   data.data_provider()->set_connect_data(MockConnect(false, 0));
   tcp_client_socket_factory_.AddSocketDataProvider(data.data_provider());
 
   ClientSocketHandle handle;
-  int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_, NULL);
+  int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_,
+                       BoundNetLog());
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(handle.is_initialized());
   EXPECT_TRUE(handle.socket());
 }
 
 TEST_F(SOCKSClientSocketPoolTest, Async) {
   SOCKS5MockData data(true);
   tcp_client_socket_factory_.AddSocketDataProvider(data.data_provider());
 
   TestCompletionCallback callback;
   ClientSocketHandle handle;
   int rv = handle.Init("a", ignored_socket_params_, LOW, &callback, pool_,
-                       NULL);
+                       BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_TRUE(handle.is_initialized());
   EXPECT_TRUE(handle.socket());
 }
 
 TEST_F(SOCKSClientSocketPoolTest, TCPConnectError) {
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider());
   socket_data->set_connect_data(MockConnect(false, ERR_CONNECTION_REFUSED));
   tcp_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   ClientSocketHandle handle;
-  int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_, NULL);
+  int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_,
+                       BoundNetLog());
   EXPECT_EQ(ERR_CONNECTION_REFUSED, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 }
 
 TEST_F(SOCKSClientSocketPoolTest, AsyncTCPConnectError) {
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider());
   socket_data->set_connect_data(MockConnect(true, ERR_CONNECTION_REFUSED));
   tcp_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   TestCompletionCallback callback;
   ClientSocketHandle handle;
   int rv = handle.Init("a", ignored_socket_params_, LOW, &callback, pool_,
-                       NULL);
+                       BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 
   EXPECT_EQ(ERR_CONNECTION_REFUSED, callback.WaitForResult());
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 }
 
 TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) {
   MockRead failed_read[] = {
     MockRead(false, 0),
   };
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider(
         failed_read, arraysize(failed_read), NULL, 0));
   socket_data->set_connect_data(MockConnect(false, 0));
   tcp_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   ClientSocketHandle handle;
   EXPECT_EQ(0, tcp_socket_pool_->release_count());
-  int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_, NULL);
+  int rv = handle.Init("a", ignored_socket_params_, LOW, NULL, pool_,
+                       BoundNetLog());
   EXPECT_EQ(ERR_SOCKS_CONNECTION_FAILED, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
   EXPECT_EQ(1, tcp_socket_pool_->release_count());
 }
 
 TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) {
   MockRead failed_read[] = {
     MockRead(true, 0),
   };
   scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider(
         failed_read, arraysize(failed_read), NULL, 0));
   socket_data->set_connect_data(MockConnect(false, 0));
   tcp_client_socket_factory_.AddSocketDataProvider(socket_data.get());
 
   TestCompletionCallback callback;
   ClientSocketHandle handle;
   EXPECT_EQ(0, tcp_socket_pool_->release_count());
   int rv = handle.Init("a", ignored_socket_params_, LOW, &callback, pool_,
-                       NULL);
+                       BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 
   EXPECT_EQ(ERR_SOCKS_CONNECTION_FAILED, callback.WaitForResult());
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
   EXPECT_EQ(1, tcp_socket_pool_->release_count());
 }
 
@@ skipping 62 matching lines @@
 
   requests_[0]->handle()->Reset();
   requests_[1]->handle()->Reset();
 }
 
 // It would be nice to also test the timeouts in SOCKSClientSocketPool.
 
 }  // namespace
 
 }  // namespace net