Index: net/test/url_request/url_request_failed_job.cc |
diff --git a/net/test/url_request/url_request_failed_job.cc b/net/test/url_request/url_request_failed_job.cc |
index e4ac6a675d0f459b96fa4ba1538def7372968be3..19276ab28f19b32c010fc091caefed8dd60da78f 100644 |
--- a/net/test/url_request/url_request_failed_job.cc |
+++ b/net/test/url_request/url_request_failed_job.cc |
@@ -109,28 +109,18 @@ void URLRequestFailedJob::Start() { |
NotifyHeadersComplete(); |
} |
-bool URLRequestFailedJob::ReadRawData(IOBuffer* buf, |
- int buf_size, |
- int* bytes_read) { |
+int URLRequestFailedJob::ReadRawData(IOBuffer* buf, int buf_size) { |
CHECK(phase_ == READ_SYNC || phase_ == READ_ASYNC); |
- if (net_error_ != ERR_IO_PENDING && phase_ == READ_SYNC) { |
- NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, net_error_)); |
- return false; |
- } |
- |
- SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0)); |
- |
- if (net_error_ == ERR_IO_PENDING) |
- return false; |
+ if (net_error_ == ERR_IO_PENDING || phase_ == READ_SYNC) |
+ return net_error_; |
DCHECK_EQ(READ_ASYNC, phase_); |
DCHECK_NE(ERR_IO_PENDING, net_error_); |
mmenke
2015/10/28 16:40:42
nit: Can remove these - they were for documentati
xunjieli
2015/10/28 21:11:52
Done.
|
base::ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, |
- base::Bind(&URLRequestFailedJob::NotifyDone, weak_factory_.GetWeakPtr(), |
- URLRequestStatus(URLRequestStatus::FAILED, net_error_))); |
- return false; |
+ FROM_HERE, base::Bind(&URLRequestFailedJob::ReadRawDataComplete, |
+ weak_factory_.GetWeakPtr(), net_error_)); |
+ return ERR_IO_PENDING; |
} |
int URLRequestFailedJob::GetResponseCode() const { |