Cronet Fix Channel Write after Close when request is canceled after success.

components/cronet/android/url_request_adapter.h

 // 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.
 
 #ifndef COMPONENTS_CRONET_ANDROID_URL_REQUEST_ADAPTER_H_
 #define COMPONENTS_CRONET_ANDROID_URL_REQUEST_ADAPTER_H_
 
 #include <jni.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 
 namespace net {
-class GrowableIOBuffer;
+class IOBufferWithSize;
 class HttpResponseHeaders;
 class UploadDataStream;
 struct RedirectInfo;
 }  // namespace net
 
 namespace cronet {
 
 class URLRequestContextAdapter;
 
 // An adapter from the JNI |UrlRequest| object and the Chromium |URLRequest|
 // object.
 class URLRequestAdapter : public net::URLRequest::Delegate {
  public:
   // The delegate which is called when the request finishes.
   class URLRequestAdapterDelegate
       : public base::RefCountedThreadSafe<URLRequestAdapterDelegate> {
    public:
     virtual void OnResponseStarted(URLRequestAdapter* request) = 0;
-    virtual void OnBytesRead(URLRequestAdapter* request) = 0;
+    virtual void OnBytesRead(URLRequestAdapter* request, int bytes_read) = 0;
     virtual void OnRequestFinished(URLRequestAdapter* request) = 0;
     virtual int ReadFromUploadChannel(net::IOBuffer* buf, int buf_length) = 0;
 
    protected:
     friend class base::RefCountedThreadSafe<URLRequestAdapterDelegate>;
     virtual ~URLRequestAdapterDelegate() {}
   };
 
   URLRequestAdapter(URLRequestContextAdapter* context,
                     URLRequestAdapterDelegate* delegate,
@@ skipping 55 matching lines @@
 
   // Returns the value of the content-type response header.
   std::string content_type() const { return content_type_; }
 
   // Returns the value of the specified response header.
   std::string GetHeader(const std::string& name) const;
 
   // Get all response headers, as a HttpResponseHeaders object.
   net::HttpResponseHeaders* GetResponseHeaders() const;
 
-  // Returns the overall number of bytes read.
-  size_t bytes_read() const { return bytes_read_; }
-
   // Returns a pointer to the downloaded data.
   unsigned char* Data() const;
 
   // Get NPN or ALPN Negotiated Protocol (if any) from HttpResponseInfo.
   std::string GetNegotiatedProtocol() const;
 
   // net::URLRequest::Delegate implementation:
   void OnResponseStarted(net::URLRequest* request) override;
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
   void OnReceivedRedirect(net::URLRequest* request,
                           const net::RedirectInfo& redirect_info,
                           bool* defer_redirect) override;
 
   bool OnNetworkThread() const;
 
  private:
   static void OnDestroyRequest(URLRequestAdapter* self);
 
   void OnInitiateConnection();
   void OnCancelRequest();
   void OnRequestSucceeded();
   void OnRequestFailed();
   void OnRequestCompleted();
-  void OnRequestCanceled();
-  void OnBytesRead(int bytes_read);
   void OnAppendChunk(const scoped_ptr<char[]> bytes, int bytes_len,
                      bool is_last_chunk);
 
   void Read();
+  bool HandleReadResult(net::URLRequest* request, int bytes_read);

[mmenke, 2014/12/10 20:59:14]

Document this method.

[mmenke, 2014/12/10 20:59:14]

No need to pass in the request, since it's always just url_request_.get().

[mef, 2014/12/10 23:23:36]

Done.

 
   URLRequestContextAdapter* context_;
   scoped_refptr<URLRequestAdapterDelegate> delegate_;
   GURL url_;
   net::RequestPriority priority_;
   std::string method_;
   net::HttpRequestHeaders headers_;
   scoped_ptr<net::URLRequest> url_request_;
   scoped_ptr<net::UploadDataStream> upload_data_stream_;
-  scoped_refptr<net::GrowableIOBuffer> read_buffer_;
-  int bytes_read_;
+  scoped_refptr<net::IOBufferWithSize> read_buffer_;
   int total_bytes_read_;
   int error_code_;
   int http_status_code_;
   std::string http_status_text_;
   std::string content_type_;
   bool canceled_;
   int64 expected_size_;
   bool chunked_upload_;
   // Indicates whether redirect has been disabled.
   bool disable_redirect_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_URL_REQUEST_ADAPTER_H_