| Index: net/url_request/url_request_file_dir_job.cc
|
| diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc
|
| index da586f3561b9508cae2bd0e58aa98dbafc66815b..e74dc0e363f671a8b9cb493e44726688ee756442 100644
|
| --- a/net/url_request/url_request_file_dir_job.cc
|
| +++ b/net/url_request/url_request_file_dir_job.cc
|
| @@ -65,7 +65,8 @@ void URLRequestFileDirJob::Kill() {
|
| weak_factory_.InvalidateWeakPtrs();
|
| }
|
|
|
| -bool URLRequestFileDirJob::ReadRawData(IOBuffer* buf, int buf_size,
|
| +bool URLRequestFileDirJob::ReadRawData(IOBuffer* buf,
|
| + int buf_size,
|
| int* bytes_read) {
|
| DCHECK(bytes_read);
|
| *bytes_read = 0;
|
| @@ -108,8 +109,8 @@ void URLRequestFileDirJob::OnListFile(
|
| // On Linux, the file system encoding is not defined, but we assume that
|
| // SysNativeMBToWide takes care of it at least for now. We can try something
|
| // more sophisticated if necessary later.
|
| - const base::string16& title = base::WideToUTF16(
|
| - base::SysNativeMBToWide(dir_path_.value()));
|
| + const base::string16& title =
|
| + base::WideToUTF16(base::SysNativeMBToWide(dir_path_.value()));
|
| #endif
|
| data_.append(GetDirectoryListingHeader(title));
|
| wrote_header_ = true;
|
| @@ -122,12 +123,11 @@ void URLRequestFileDirJob::OnListFile(
|
| base::FilePath filename = data.info.GetName();
|
| const std::string& raw_bytes = filename.value();
|
| #endif
|
| - data_.append(GetDirectoryListingEntry(
|
| - data.info.GetName().LossyDisplayName(),
|
| - raw_bytes,
|
| - data.info.IsDirectory(),
|
| - data.info.GetSize(),
|
| - data.info.GetLastModifiedTime()));
|
| + data_.append(GetDirectoryListingEntry(data.info.GetName().LossyDisplayName(),
|
| + raw_bytes,
|
| + data.info.IsDirectory(),
|
| + data.info.GetSize(),
|
| + data.info.GetLastModifiedTime()));
|
|
|
| // TODO(darin): coalesce more?
|
| CompleteRead();
|
| @@ -144,13 +144,14 @@ void URLRequestFileDirJob::OnListDone(int error) {
|
| }
|
| }
|
|
|
| -URLRequestFileDirJob::~URLRequestFileDirJob() {}
|
| +URLRequestFileDirJob::~URLRequestFileDirJob() {
|
| +}
|
|
|
| void URLRequestFileDirJob::CompleteRead() {
|
| if (read_pending_) {
|
| int bytes_read;
|
| - if (FillReadBuffer(read_buffer_->data(), read_buffer_length_,
|
| - &bytes_read)) {
|
| + if (FillReadBuffer(
|
| + read_buffer_->data(), read_buffer_length_, &bytes_read)) {
|
| // We completed the read, so reset the read buffer.
|
| read_pending_ = false;
|
| read_buffer_ = NULL;
|
| @@ -166,7 +167,8 @@ void URLRequestFileDirJob::CompleteRead() {
|
| }
|
| }
|
|
|
| -bool URLRequestFileDirJob::FillReadBuffer(char* buf, int buf_size,
|
| +bool URLRequestFileDirJob::FillReadBuffer(char* buf,
|
| + int buf_size,
|
| int* bytes_read) {
|
| DCHECK(bytes_read);
|
|
|
|
|