Make URLRequest::Read to return net errors or bytes read instead of a bool

net/url_request/url_request_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/url_request/url_request_job.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 145 matching lines @@
   // Kill().
   // TODO(mmenke):  The URLRequest is currently deleted before this method
   // invokes its async callback whenever this is called by the URLRequest.
   // Try to simplify how cancellation works.
   NotifyCanceled();
 }
 
 // This function calls ReadRawData to get stream data. If a filter exists, it
 // passes the data to the attached filter. It then returns the output from
 // filter back to the caller.
+int URLRequestJob::Read(IOBuffer* buf, int buf_size) {
+  DCHECK_LT(buf_size, 1000000);  // Sanity check.
+  DCHECK(buf);
+  DCHECK(!filtered_read_buffer_);
+  DCHECK_EQ(0, filtered_read_buffer_len_);
+
+  Error error = OK;
+  int bytes_read = 0;
+
+  // Skip Filter if not present.
+  if (!filter_) {
+    error = ReadRawDataHelper(buf, buf_size, &bytes_read);
+  } else {
+    // Save the caller's buffers while we do IO
+    // in the filter's buffers.
+    filtered_read_buffer_ = buf;
+    filtered_read_buffer_len_ = buf_size;
+
+    error = ReadFilteredData(&bytes_read);
+
+    // Synchronous EOF from the filter.
+    if (error == OK && bytes_read == 0)
+      DoneReading();
+  }
+
+  if (error == OK) {
+    // If URLRequestJob read zero bytes, the job is at EOF.
+    if (bytes_read == 0)
+      NotifyDone(URLRequestStatus());
+  } else if (error == ERR_IO_PENDING) {
+    bytes_read = ERR_IO_PENDING;
+  } else {
+    NotifyDone(URLRequestStatus::FromError(error));
+    bytes_read = error;
+  }
+  return bytes_read;
+}
+
+// Deprecated.
 bool URLRequestJob::Read(IOBuffer* buf, int buf_size, int *bytes_read) {
   DCHECK_LT(buf_size, 1000000);  // Sanity check.
   DCHECK(buf);
   DCHECK(bytes_read);
   DCHECK(!filtered_read_buffer_);
   DCHECK_EQ(0, filtered_read_buffer_len_);
 
   Error error = OK;
   *bytes_read = 0;
 
@@ skipping 835 matching lines @@
   int64_t total_sent_bytes = GetTotalSentBytes();
   DCHECK_GE(total_sent_bytes, last_notified_total_sent_bytes_);
   if (total_sent_bytes > last_notified_total_sent_bytes_) {
     network_delegate_->NotifyNetworkBytesSent(
         request_, total_sent_bytes - last_notified_total_sent_bytes_);
   }
   last_notified_total_sent_bytes_ = total_sent_bytes;
 }
 
 }  // namespace net