Index: net/url_request/url_request_file_job.cc |
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc |
index 011a0daff23c8dee4617734d3148a05592c8c364..37e305a78d99c69a806c3cfb05901481120f43dc 100644 |
--- a/net/url_request/url_request_file_job.cc |
+++ b/net/url_request/url_request_file_job.cc |
@@ -63,13 +63,15 @@ URLRequestFileJob::URLRequestFileJob( |
stream_(new FileStream(file_task_runner)), |
file_task_runner_(file_task_runner), |
remaining_bytes_(0), |
- weak_ptr_factory_(this) {} |
+ weak_ptr_factory_(this) { |
+} |
void URLRequestFileJob::Start() { |
FileMetaInfo* meta_info = new FileMetaInfo(); |
file_task_runner_->PostTaskAndReply( |
FROM_HERE, |
- base::Bind(&URLRequestFileJob::FetchMetaInfo, file_path_, |
+ base::Bind(&URLRequestFileJob::FetchMetaInfo, |
+ file_path_, |
base::Unretained(meta_info)), |
base::Bind(&URLRequestFileJob::DidFetchMetaInfo, |
weak_ptr_factory_.GetWeakPtr(), |
@@ -162,7 +164,8 @@ bool URLRequestFileJob::IsRedirectResponse(GURL* location, |
Filter* URLRequestFileJob::SetupFilter() const { |
// Bug 9936 - .svgz files needs to be decompressed. |
return LowerCaseEqualsASCII(file_path_.Extension(), ".svgz") |
- ? Filter::GZipFactory() : NULL; |
+ ? Filter::GZipFactory() |
+ : NULL; |
} |
bool URLRequestFileJob::GetMimeType(std::string* mime_type) const { |
@@ -214,8 +217,8 @@ void URLRequestFileJob::FetchMetaInfo(const base::FilePath& file_path, |
} |
// On Windows GetMimeTypeFromFile() goes to the registry. Thus it should be |
// done in WorkerPool. |
- meta_info->mime_type_result = GetMimeTypeFromFile(file_path, |
- &meta_info->mime_type); |
+ meta_info->mime_type_result = |
+ GetMimeTypeFromFile(file_path, &meta_info->mime_type); |
} |
void URLRequestFileJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) { |
@@ -238,12 +241,12 @@ void URLRequestFileJob::DidFetchMetaInfo(const FileMetaInfo* meta_info) { |
return; |
} |
- int flags = base::File::FLAG_OPEN | |
- base::File::FLAG_READ | |
- base::File::FLAG_ASYNC; |
- int rv = stream_->Open(file_path_, flags, |
- base::Bind(&URLRequestFileJob::DidOpen, |
- weak_ptr_factory_.GetWeakPtr())); |
+ int flags = |
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC; |
+ int rv = stream_->Open( |
+ file_path_, |
+ flags, |
+ base::Bind(&URLRequestFileJob::DidOpen, weak_ptr_factory_.GetWeakPtr())); |
if (rv != ERR_IO_PENDING) |
DidOpen(rv); |
} |
@@ -256,16 +259,17 @@ void URLRequestFileJob::DidOpen(int result) { |
if (!byte_range_.ComputeBounds(meta_info_.file_size)) { |
NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, |
- ERR_REQUEST_RANGE_NOT_SATISFIABLE)); |
+ ERR_REQUEST_RANGE_NOT_SATISFIABLE)); |
return; |
} |
- remaining_bytes_ = byte_range_.last_byte_position() - |
- byte_range_.first_byte_position() + 1; |
+ remaining_bytes_ = |
+ byte_range_.last_byte_position() - byte_range_.first_byte_position() + 1; |
DCHECK_GE(remaining_bytes_, 0); |
if (remaining_bytes_ > 0 && byte_range_.first_byte_position() != 0) { |
- int rv = stream_->Seek(FROM_BEGIN, byte_range_.first_byte_position(), |
+ int rv = stream_->Seek(FROM_BEGIN, |
+ byte_range_.first_byte_position(), |
base::Bind(&URLRequestFileJob::DidSeek, |
weak_ptr_factory_.GetWeakPtr())); |
if (rv != ERR_IO_PENDING) { |