Reland: URLRequestJob: change ReadRawData contract

net/url_request/url_request_simple_job.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 10 matching lines @@
 namespace net {
 
 class URLRequest;
 
 class NET_EXPORT URLRequestSimpleJob : public URLRangeRequestJob {
  public:
   URLRequestSimpleJob(URLRequest* request, NetworkDelegate* network_delegate);
 
   void Start() override;
   void Kill() override;
-  bool ReadRawData(IOBuffer* buf, int buf_size, int* bytes_read) override;
+  int ReadRawData(IOBuffer* buf, int buf_size) override;
   bool GetMimeType(std::string* mime_type) const override;
   bool GetCharset(std::string* charset) override;
 
  protected:
   ~URLRequestSimpleJob() override;
 
   // Subclasses must override either GetData or GetRefCountedData to define the
   // way response data is determined.
   // The return value should be:
   //  - OK if data is obtained;
@@ skipping 17 matching lines @@
                                 const CompletionCallback& callback) const;
 
   // Returns the task runner used by ReadRawData. This method is virtual so
   // that it can be overridden in tests.
   virtual base::TaskRunner* GetTaskRunner() const;
 
   void StartAsync();
 
  private:
   void OnGetDataCompleted(int result);
-  void OnReadCompleted(int bytes_read);
 
   HttpByteRange byte_range_;
   std::string mime_type_;
   std::string charset_;
   scoped_refptr<base::RefCountedMemory> data_;
   int64 next_data_offset_;
   scoped_refptr<base::TaskRunner> task_runner_;
   base::WeakPtrFactory<URLRequestSimpleJob> weak_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_