Reland: URLRequestJob: change ReadRawData contract

content/browser/android/url_request_content_job.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_URL_REQUEST_CONTENT_JOB_H_
 #define CONTENT_BROWSER_ANDROID_URL_REQUEST_CONTENT_JOB_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
+#include "net/base/net_errors.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace file_util {
 struct FileInfo;
@@ skipping 10 matching lines @@
  public:
   URLRequestContentJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       const base::FilePath& content_path,
       const scoped_refptr<base::TaskRunner>& content_task_runner);
 
   // net::URLRequestJob:
   void Start() override;
   void Kill() override;
-  bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override;
+  int ReadRawData(net::IOBuffer* buf, int buf_size) override;
   bool IsRedirectResponse(GURL* location, int* http_status_code) override;
   bool GetMimeType(std::string* mime_type) const override;
   void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers) override;
 
  protected:
   ~URLRequestContentJob() override;
 
  private:
   // Meta information about the content URI. It's used as a member in the
   // URLRequestContentJob and also passed between threads because disk access is
@@ skipping 16 matching lines @@
   void DidFetchMetaInfo(const ContentMetaInfo* meta_info);
 
   // Callback after opening content URI on a background thread.
   void DidOpen(int result);
 
   // Callback after seeking to the beginning of |byte_range_| in the content URI
   // on a background thread.
   void DidSeek(int64 result);
 
   // Callback after data is asynchronously read from the content URI into |buf|.
-  void DidRead(scoped_refptr<net::IOBuffer> buf, int result);
+  void DidRead(int result);
 
   // The full path of the content URI.
   base::FilePath content_path_;
 
   scoped_ptr<net::FileStream> stream_;
   ContentMetaInfo meta_info_;
   const scoped_refptr<base::TaskRunner> content_task_runner_;
 
   net::HttpByteRange byte_range_;
+  net::Error range_parse_result_;
   int64 remaining_bytes_;
 
   bool io_pending_;
 
   base::WeakPtrFactory<URLRequestContentJob> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContentJob);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_URL_REQUEST_CONTENT_JOB_H_