summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_http_stream.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/spdy/spdy_http_stream.cc
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_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/spdy/spdy_http_stream.cc')
-rw-r--r--net/spdy/spdy_http_stream.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index ac0c4ce..474d497 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -50,7 +50,7 @@ SpdyHttpStream::~SpdyHttpStream() {
int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info,
const BoundNetLog& stream_net_log,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!stream_.get());
if (spdy_session_->IsClosed())
return ERR_CONNECTION_CLOSED;
@@ -82,7 +82,7 @@ uint64 SpdyHttpStream::GetUploadProgress() const {
return request_body_stream_->position();
}
-int SpdyHttpStream::ReadResponseHeaders(CompletionCallback* callback) {
+int SpdyHttpStream::ReadResponseHeaders(OldCompletionCallback* callback) {
CHECK(callback);
CHECK(!stream_->cancelled());
@@ -102,7 +102,7 @@ int SpdyHttpStream::ReadResponseHeaders(CompletionCallback* callback) {
}
int SpdyHttpStream::ReadResponseBody(
- IOBuffer* buf, int buf_len, CompletionCallback* callback) {
+ IOBuffer* buf, int buf_len, OldCompletionCallback* callback) {
CHECK(stream_->is_idle());
CHECK(buf);
CHECK(buf_len);
@@ -190,7 +190,7 @@ void SpdyHttpStream::set_chunk_callback(ChunkCallback* callback) {
int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
UploadDataStream* request_body,
HttpResponseInfo* response,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
base::Time request_time = base::Time::Now();
CHECK(stream_.get());
@@ -451,7 +451,7 @@ void SpdyHttpStream::DoCallback(int rv) {
CHECK(user_callback_);
// Since Run may result in being called back, clear user_callback_ in advance.
- CompletionCallback* c = user_callback_;
+ OldCompletionCallback* c = user_callback_;
user_callback_ = NULL;
c->Run(rv);
}