| Index: net/base/elements_upload_data_stream.cc
|
| diff --git a/net/base/elements_upload_data_stream.cc b/net/base/elements_upload_data_stream.cc
|
| index 86ea28c72135021f6292ae7d2ec7d73bb17a318e..a0429fa2e65957d6f1e41fc1cf83669a4270200d 100644
|
| --- a/net/base/elements_upload_data_stream.cc
|
| +++ b/net/base/elements_upload_data_stream.cc
|
| @@ -40,9 +40,7 @@ int ElementsUploadDataStream::InitInternal() {
|
| return InitElements(0);
|
| }
|
|
|
| -int ElementsUploadDataStream::ReadInternal(
|
| - IOBuffer* buf,
|
| - int buf_len) {
|
| +int ElementsUploadDataStream::ReadInternal(IOBuffer* buf, int buf_len) {
|
| DCHECK_GT(buf_len, 0);
|
| return ReadElements(new DrainableIOBuffer(buf, buf_len));
|
| }
|
| @@ -129,9 +127,9 @@ int ElementsUploadDataStream::ReadElements(
|
| if (read_failed_) {
|
| // If an error occured during read operation, then pad with zero.
|
| // Otherwise the server will hang waiting for the rest of the data.
|
| - int num_bytes_to_fill = std::min(
|
| - static_cast<uint64>(buf->BytesRemaining()),
|
| - size() - position() - buf->BytesConsumed());
|
| + int num_bytes_to_fill =
|
| + std::min(static_cast<uint64>(buf->BytesRemaining()),
|
| + size() - position() - buf->BytesConsumed());
|
| DCHECK_LE(0, num_bytes_to_fill);
|
| memset(buf->data(), 0, num_bytes_to_fill);
|
| buf->DidConsume(num_bytes_to_fill);
|
|
|