Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: net/base/upload_file_element_reader.cc

Issue 642403002: git cl format the first third of the net/base directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/upload_file_element_reader.cc
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index 687856404671acc95fe4449ea5b93c34168f6c9b..f63287e615cab96c999942073f44d4f70ab3416f 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -53,8 +53,7 @@ int UploadFileElementReader::Init(const CompletionCallback& callback) {
file_stream_.reset(new FileStream(task_runner_.get()));
int result = file_stream_->Open(
path_,
- base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC,
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC,
base::Bind(&UploadFileElementReader::OnOpenCompleted,
weak_ptr_factory_.GetWeakPtr(),
callback));
@@ -83,7 +82,8 @@ int UploadFileElementReader::Read(IOBuffer* buf,
return 0;
int result = file_stream_->Read(
- buf, num_bytes_to_read,
+ buf,
+ num_bytes_to_read,
base::Bind(base::IgnoreResult(&UploadFileElementReader::OnReadCompleted),
weak_ptr_factory_.GetWeakPtr(),
callback));
@@ -113,11 +113,12 @@ void UploadFileElementReader::OnOpenCompleted(
}
if (range_offset_) {
- int result = file_stream_->Seek(
- base::File::FROM_BEGIN, range_offset_,
- base::Bind(&UploadFileElementReader::OnSeekCompleted,
- weak_ptr_factory_.GetWeakPtr(),
- callback));
+ int result =
+ file_stream_->Seek(base::File::FROM_BEGIN,
+ range_offset_,
+ base::Bind(&UploadFileElementReader::OnSeekCompleted,
+ weak_ptr_factory_.GetWeakPtr(),
+ callback));
DCHECK_GT(0, result);
if (result != ERR_IO_PENDING)
callback.Run(result);
@@ -173,7 +174,7 @@ void UploadFileElementReader::OnGetFileInfoCompleted(
// time_t to compare. This check is used for sliced files.
if (!expected_modification_time_.is_null() &&
expected_modification_time_.ToTimeT() !=
- file_info->last_modified.ToTimeT()) {
+ file_info->last_modified.ToTimeT()) {
callback.Run(ERR_UPLOAD_FILE_CHANGED);
return;
}
@@ -183,9 +184,8 @@ void UploadFileElementReader::OnGetFileInfoCompleted(
callback.Run(OK);
}
-int UploadFileElementReader::OnReadCompleted(
- const CompletionCallback& callback,
- int result) {
+int UploadFileElementReader::OnReadCompleted(const CompletionCallback& callback,
+ int result) {
if (result == 0) // Reached end-of-file earlier than expected.
result = ERR_UPLOAD_FILE_CHANGED;
@@ -200,12 +200,12 @@ int UploadFileElementReader::OnReadCompleted(
}
UploadFileElementReader::ScopedOverridingContentLengthForTests::
-ScopedOverridingContentLengthForTests(uint64 value) {
+ ScopedOverridingContentLengthForTests(uint64 value) {
overriding_content_length = value;
}
UploadFileElementReader::ScopedOverridingContentLengthForTests::
-~ScopedOverridingContentLengthForTests() {
+ ~ScopedOverridingContentLengthForTests() {
overriding_content_length = 0;
}

Powered by Google App Engine
This is Rietveld 408576698