URLRequestJob: change ReadRawData contract

net/test/url_request/url_request_failed_job.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/url_request/url_request_failed_job.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 91 matching lines @@
       NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, net_error_));
       return;
     }
     SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
     return;
   }
   response_info_.headers = new net::HttpResponseHeaders("HTTP/1.1 200 OK");
   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 documentation purposes, but now they just
match the previous line exactly.

[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 {
   // If we have headers, get the response code from them.
   if (response_info_.headers)
     return response_info_.headers->response_code();
   return URLRequestJob::GetResponseCode();
 }
 
 void URLRequestFailedJob::GetResponseInfo(HttpResponseInfo* info) {
@@ skipping 45 matching lines @@
 GURL URLRequestFailedJob::GetMockHttpsUrlForHostname(
     int net_error,
     const std::string& hostname) {
   return GetMockUrl("https", hostname, START, net_error);
 }
 
 URLRequestFailedJob::~URLRequestFailedJob() {
 }
 
 }  // namespace net