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/ftp | |
| 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/ftp')
| -rw-r--r-- | net/ftp/ftp_network_transaction_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index 33145a5..6e814aa 100644 --- a/net/ftp/ftp_network_transaction_unittest.cc +++ b/net/ftp/ftp_network_transaction_unittest.cc @@ -715,7 +715,7 @@ class FtpNetworkTransactionTest : public PlatformTest { FtpRequestInfo request_info = GetRequestInfo(request); EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState()); ASSERT_EQ(ERR_IO_PENDING, - transaction_.Start(&request_info, &callback_, NULL)); + transaction_.Start(&request_info, &callback_, BoundNetLog())); EXPECT_NE(LOAD_STATE_IDLE, transaction_.GetLoadState()); ASSERT_EQ(expected_result, callback_.WaitForResult()); if (expected_result == OK) { @@ -761,7 +761,7 @@ TEST_F(FtpNetworkTransactionTest, FailedLookup) { host_resolver_->rules()->AddSimulatedFailure("badhost"); EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState()); ASSERT_EQ(ERR_IO_PENDING, - transaction_.Start(&request_info, &callback_, NULL)); + transaction_.Start(&request_info, &callback_, BoundNetLog())); ASSERT_EQ(ERR_NAME_NOT_RESOLVED, callback_.WaitForResult()); EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState()); } @@ -962,7 +962,7 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransactionEvilPasvUnsafeHost) { // Start the transaction. ASSERT_EQ(ERR_IO_PENDING, - transaction_.Start(&request_info, &callback_, NULL)); + transaction_.Start(&request_info, &callback_, BoundNetLog())); ASSERT_EQ(OK, callback_.WaitForResult()); // The transaction fires the callback when we can start reading data. That @@ -1085,7 +1085,7 @@ TEST_F(FtpNetworkTransactionTest, EvilRestartUser) { FtpRequestInfo request_info = GetRequestInfo("ftp://host/file"); ASSERT_EQ(ERR_IO_PENDING, - transaction_.Start(&request_info, &callback_, NULL)); + transaction_.Start(&request_info, &callback_, BoundNetLog())); ASSERT_EQ(ERR_FAILED, callback_.WaitForResult()); MockRead ctrl_reads[] = { @@ -1115,7 +1115,7 @@ TEST_F(FtpNetworkTransactionTest, EvilRestartPassword) { FtpRequestInfo request_info = GetRequestInfo("ftp://host/file"); ASSERT_EQ(ERR_IO_PENDING, - transaction_.Start(&request_info, &callback_, NULL)); + transaction_.Start(&request_info, &callback_, BoundNetLog())); ASSERT_EQ(ERR_FAILED, callback_.WaitForResult()); MockRead ctrl_reads[] = { |