diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 20:12:27 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 20:12:27 +0000 |
| commit | 5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef (patch) | |
| tree | 2f8ce83b395dee893febd751f95ee4b85422c6b2 /net/socket/socks_client_socket_pool_unittest.cc | |
| parent | 3f4a48393754bd0bb8dcf6bb73241154a695dae3 (diff) | |
| download | chromium_src-5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef.zip chromium_src-5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef.tar.gz chromium_src-5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef.tar.bz2 | |
Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing NULL in place of a const BoundNetLog&.
BUG=37421
Review URL: http://codereview.chromium.org/1783008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool_unittest.cc')
| -rw-r--r-- | net/socket/socks_client_socket_pool_unittest.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc index e2e30a3..577a39b 100644 --- a/net/socket/socks_client_socket_pool_unittest.cc +++ b/net/socket/socks_client_socket_pool_unittest.cc @@ -199,7 +199,8 @@ TEST_F(SOCKSClientSocketPoolTest, Simple) { 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()); @@ -212,7 +213,7 @@ TEST_F(SOCKSClientSocketPoolTest, Async) { 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()); @@ -228,7 +229,8 @@ TEST_F(SOCKSClientSocketPoolTest, TCPConnectError) { 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()); @@ -242,7 +244,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTCPConnectError) { 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()); @@ -263,7 +265,8 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) { 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()); @@ -283,7 +286,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) { 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()); |