| Index: net/http/http_pipelined_stream.cc
|
| diff --git a/net/http/http_pipelined_stream.cc b/net/http/http_pipelined_stream.cc
|
| index cc267e2510ec78b07e10764ff4e616c649a9d67f..d33ebb20b50c499e0f7f5d124feb2425118340bb 100644
|
| --- a/net/http/http_pipelined_stream.cc
|
| +++ b/net/http/http_pipelined_stream.cc
|
| @@ -16,26 +16,22 @@ namespace net {
|
|
|
| HttpPipelinedStream::HttpPipelinedStream(HttpPipelinedConnectionImpl* pipeline,
|
| int pipeline_id)
|
| - : pipeline_(pipeline),
|
| - pipeline_id_(pipeline_id),
|
| - request_info_(NULL) {
|
| + : pipeline_(pipeline), pipeline_id_(pipeline_id), request_info_(NULL) {
|
| }
|
|
|
| HttpPipelinedStream::~HttpPipelinedStream() {
|
| pipeline_->OnStreamDeleted(pipeline_id_);
|
| }
|
|
|
| -int HttpPipelinedStream::InitializeStream(
|
| - const HttpRequestInfo* request_info,
|
| - RequestPriority priority,
|
| - const BoundNetLog& net_log,
|
| - const CompletionCallback& callback) {
|
| +int HttpPipelinedStream::InitializeStream(const HttpRequestInfo* request_info,
|
| + RequestPriority priority,
|
| + const BoundNetLog& net_log,
|
| + const CompletionCallback& callback) {
|
| request_info_ = request_info;
|
| pipeline_->InitializeParser(pipeline_id_, request_info, net_log);
|
| return OK;
|
| }
|
|
|
| -
|
| int HttpPipelinedStream::SendRequest(const HttpRequestHeaders& headers,
|
| HttpResponseInfo* response,
|
| const CompletionCallback& callback) {
|
| @@ -43,11 +39,10 @@ int HttpPipelinedStream::SendRequest(const HttpRequestHeaders& headers,
|
| CHECK(request_info_);
|
| // TODO(simonjam): Proxy support will be needed here.
|
| const std::string path = HttpUtil::PathForRequest(request_info_->url);
|
| - std::string request_line_ = base::StringPrintf("%s %s HTTP/1.1\r\n",
|
| - request_info_->method.c_str(),
|
| - path.c_str());
|
| - return pipeline_->SendRequest(pipeline_id_, request_line_, headers, response,
|
| - callback);
|
| + std::string request_line_ = base::StringPrintf(
|
| + "%s %s HTTP/1.1\r\n", request_info_->method.c_str(), path.c_str());
|
| + return pipeline_->SendRequest(
|
| + pipeline_id_, request_line_, headers, response, callback);
|
| }
|
|
|
| UploadProgress HttpPipelinedStream::GetUploadProgress() const {
|
| @@ -63,7 +58,8 @@ const HttpResponseInfo* HttpPipelinedStream::GetResponseInfo() const {
|
| return pipeline_->GetResponseInfo(pipeline_id_);
|
| }
|
|
|
| -int HttpPipelinedStream::ReadResponseBody(IOBuffer* buf, int buf_len,
|
| +int HttpPipelinedStream::ReadResponseBody(IOBuffer* buf,
|
| + int buf_len,
|
| const CompletionCallback& callback) {
|
| return pipeline_->ReadResponseBody(pipeline_id_, buf, buf_len, callback);
|
| }
|
|
|