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

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: Nit Created 6 years, 1 month 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 46824668ccee5fa812517bda2df447d5d97ea3ae..c37db03599a77d8f4340a80beb5f5473ae8b347f 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -54,11 +54,9 @@ 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));
+ weak_ptr_factory_.GetWeakPtr(), callback));
DCHECK_GT(0, result);
return result;
}
@@ -86,8 +84,7 @@ int UploadFileElementReader::Read(IOBuffer* buf,
int result = file_stream_->Read(
buf, num_bytes_to_read,
base::Bind(base::IgnoreResult(&UploadFileElementReader::OnReadCompleted),
- weak_ptr_factory_.GetWeakPtr(),
- callback));
+ weak_ptr_factory_.GetWeakPtr(), callback));
// Even in async mode, FileStream::Read() may return the result synchronously.
if (result != ERR_IO_PENDING)
return OnReadCompleted(CompletionCallback(), result);
@@ -122,8 +119,7 @@ void UploadFileElementReader::OnOpenCompleted(
int result = file_stream_->Seek(
base::File::FROM_BEGIN, range_offset_,
base::Bind(&UploadFileElementReader::OnSeekCompleted,
- weak_ptr_factory_.GetWeakPtr(),
- callback));
+ weak_ptr_factory_.GetWeakPtr(), callback));
DCHECK_GT(0, result);
if (result != ERR_IO_PENDING)
callback.Run(result);
@@ -146,12 +142,10 @@ void UploadFileElementReader::OnSeekCompleted(
base::File::Info* file_info = new base::File::Info;
bool posted = base::PostTaskAndReplyWithResult(
- task_runner_.get(),
- FROM_HERE,
+ task_runner_.get(), FROM_HERE,
base::Bind(&base::GetFileInfo, path_, file_info),
base::Bind(&UploadFileElementReader::OnGetFileInfoCompleted,
- weak_ptr_factory_.GetWeakPtr(),
- callback,
+ weak_ptr_factory_.GetWeakPtr(), callback,
base::Owned(file_info)));
DCHECK(posted);
}
@@ -179,7 +173,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;
}
@@ -189,9 +183,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;
@@ -206,12 +199,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