diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
commit | f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch) | |
tree | 6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/http/http_transaction_unittest.cc | |
parent | d1666539b57bf8552e203d355fd09909d36f9732 (diff) | |
download | chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2 |
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback.
Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8070013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_transaction_unittest.cc')
-rw-r--r-- | net/http/http_transaction_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc index 38347e0..a958d8b 100644 --- a/net/http/http_transaction_unittest.cc +++ b/net/http/http_transaction_unittest.cc @@ -221,7 +221,7 @@ MockNetworkTransaction::MockNetworkTransaction(MockNetworkLayer* factory) MockNetworkTransaction::~MockNetworkTransaction() {} int MockNetworkTransaction::Start(const net::HttpRequestInfo* request, - net::CompletionCallback* callback, + net::OldCompletionCallback* callback, const net::BoundNetLog& net_log) { const MockTransaction* t = FindMockTransaction(request->url); if (!t) @@ -260,19 +260,19 @@ int MockNetworkTransaction::Start(const net::HttpRequestInfo* request, } int MockNetworkTransaction::RestartIgnoringLastError( - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { return net::ERR_FAILED; } int MockNetworkTransaction::RestartWithCertificate( net::X509Certificate* client_cert, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { return net::ERR_FAILED; } int MockNetworkTransaction::RestartWithAuth(const string16& username, const string16& password, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { return net::ERR_FAILED; } @@ -281,7 +281,7 @@ bool MockNetworkTransaction::IsReadyToRestartForAuth() { } int MockNetworkTransaction::Read(net::IOBuffer* buf, int buf_len, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { int data_len = static_cast<int>(data_.size()); int num = std::min(buf_len, data_len - data_cursor_); if (num) { @@ -316,13 +316,13 @@ uint64 MockNetworkTransaction::GetUploadProgress() const { return 0; } -void MockNetworkTransaction::CallbackLater(net::CompletionCallback* callback, +void MockNetworkTransaction::CallbackLater(net::OldCompletionCallback* callback, int result) { MessageLoop::current()->PostTask(FROM_HERE, task_factory_.NewRunnableMethod( &MockNetworkTransaction::RunCallback, callback, result)); } -void MockNetworkTransaction::RunCallback(net::CompletionCallback* callback, +void MockNetworkTransaction::RunCallback(net::OldCompletionCallback* callback, int result) { callback->Run(result); } @@ -357,7 +357,7 @@ net::HttpNetworkSession* MockNetworkLayer::GetSession() { int ReadTransaction(net::HttpTransaction* trans, std::string* result) { int rv; - TestCompletionCallback callback; + TestOldCompletionCallback callback; std::string content; do { |