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

net/url_request/url_request_test_util.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_TEST_UTIL_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 
 #include <stdint.h>
 #include <stdlib.h>
 
@@ skipping 162 matching lines @@
   bool have_certificate_errors() const { return have_certificate_errors_; }
   bool certificate_errors_are_fatal() const {
     return certificate_errors_are_fatal_;
   }
   bool auth_required_called() const { return auth_required_; }
   bool have_full_request_headers() const { return have_full_request_headers_; }
   const HttpRequestHeaders& full_request_headers() const {
     return full_request_headers_;
   }
   void ClearFullRequestHeaders();
+  int request_status() const { return request_status_; }
 
   // URLRequest::Delegate:
   void OnReceivedRedirect(URLRequest* request,
                           const RedirectInfo& redirect_info,
                           bool* defer_redirect) override;
   void OnAuthRequired(URLRequest* request,
                       AuthChallengeInfo* auth_info) override;
   // NOTE: |fatal| causes |certificate_errors_are_fatal_| to be set to true.
   // (Unit tests use this as a post-condition.) But for policy, this method
   // consults |allow_certificate_errors_|.
   void OnSSLCertificateError(URLRequest* request,
                              const SSLInfo& ssl_info,
                              bool fatal) override;
+  void OnResponseStarted(URLRequest* request, int net_error) override;
+  // Deprecated.
   void OnResponseStarted(URLRequest* request) override;
   void OnReadCompleted(URLRequest* request, int bytes_read) override;
 
  private:
   static const int kBufferSize = 4096;
 
   virtual void OnResponseCompleted(URLRequest* request);
 
   // options for controlling behavior
   bool cancel_in_rr_;
@@ skipping 12 matching lines @@
   int received_redirect_count_;
   bool received_data_before_response_;
   bool request_failed_;
   bool have_certificate_errors_;
   bool certificate_errors_are_fatal_;
   bool auth_required_;
   std::string data_received_;
   bool have_full_request_headers_;
   HttpRequestHeaders full_request_headers_;
 
+  // tracks status of request
+  int request_status_;
+
   // our read buffer
   scoped_refptr<IOBuffer> buf_;
+
+  // Temporarly used to distinguish old and new code.
+  bool old_;
 };
 
 //-----------------------------------------------------------------------------
 
 class TestNetworkDelegate : public NetworkDelegateImpl {
  public:
   enum Options {
     NO_GET_COOKIES = 1 << 0,
     NO_SET_COOKIE  = 1 << 1,
   };
@@ skipping 80 matching lines @@
                            HttpRequestHeaders* headers) override;
   void OnStartTransaction(URLRequest* request,
                           const HttpRequestHeaders& headers) override;
   int OnHeadersReceived(
       URLRequest* request,
       const CompletionCallback& callback,
       const HttpResponseHeaders* original_response_headers,
       scoped_refptr<HttpResponseHeaders>* override_response_headers,
       GURL* allowed_unsafe_redirect_url) override;
   void OnBeforeRedirect(URLRequest* request, const GURL& new_location) override;
+  void OnResponseStarted(URLRequest* request, int net_error) override;
+  // Deprecated.
   void OnResponseStarted(URLRequest* request) override;
   void OnNetworkBytesReceived(URLRequest* request,
                               int64_t bytes_received) override;
   void OnNetworkBytesSent(URLRequest* request, int64_t bytes_sent) override;
+  void OnCompleted(URLRequest* request, bool started, int net_error) override;
+  // Deprecated.
   void OnCompleted(URLRequest* request, bool started) override;
   void OnURLRequestDestroyed(URLRequest* request) override;
   void OnPACScriptError(int line_number, const base::string16& error) override;
   NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       URLRequest* request,
       const AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
       AuthCredentials* credentials) override;
   bool OnCanGetCookies(const URLRequest& request,
                        const CookieList& cookie_list) override;
@@ skipping 68 matching lines @@
       NetworkDelegate* network_delegate) const override;
   void set_main_intercept_job(std::unique_ptr<URLRequestJob> job);
 
  private:
   mutable std::unique_ptr<URLRequestJob> main_intercept_job_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_