Revert "Reland: URLRequestJob: change ReadRawData contract"

net/test/url_request/url_request_mock_data_job.cc

 // Copyright 2014 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_mock_data_job.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 86 matching lines @@
   // Start reading asynchronously so that all error reporting and data
   // callbacks happen as they would for network requests.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&URLRequestMockDataJob::StartAsync,
                             weak_factory_.GetWeakPtr()));
 }
 
 URLRequestMockDataJob::~URLRequestMockDataJob() {
 }
 
-int URLRequestMockDataJob::ReadRawData(IOBuffer* buf, int buf_size) {
-  int bytes_read =
-      std::min(static_cast<size_t>(buf_size), data_.length() - data_offset_);
-  memcpy(buf->data(), data_.c_str() + data_offset_, bytes_read);
-  data_offset_ += bytes_read;
-  return bytes_read;
+bool URLRequestMockDataJob::ReadRawData(IOBuffer* buf,
+                                        int buf_size,
+                                        int* bytes_read) {
+  DCHECK(bytes_read);
+  *bytes_read = static_cast<int>(
+      std::min(static_cast<size_t>(buf_size), data_.length() - data_offset_));
+  memcpy(buf->data(), data_.c_str() + data_offset_, *bytes_read);
+  data_offset_ += *bytes_read;
+  return true;
 }
 
 int URLRequestMockDataJob::GetResponseCode() const {
   HttpResponseInfo info;
   GetResponseInfoConst(&info);
   return info.headers->response_code();
 }
 
 // Public virtual version.
 void URLRequestMockDataJob::GetResponseInfo(HttpResponseInfo* info) {
@@ skipping 60 matching lines @@
 
 // static
 GURL URLRequestMockDataJob::GetMockHttpsUrlForHostname(
     const std::string& hostname,
     const std::string& data,
     int repeat_count) {
   return GetMockUrl("https", hostname, data, repeat_count);
 }
 
 }  // namespace net