Cronet modifications to support AGSA.

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/base/upload_data_stream.h"

[mef, 2014/08/15 13:30:22]

not needed?

[mdumitrescu, 2014/08/15 15:23:13]

Done.

 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 
 namespace net {
 class GrowableIOBuffer;
 class HttpResponseHeaders;
 class UploadDataStream;
 }  // 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 OnAppendChunkCompleted(URLRequestAdapter* request) = 0;
     virtual void OnResponseStarted(URLRequestAdapter* request) = 0;
     virtual void OnBytesRead(URLRequestAdapter* request) = 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,
                     GURL url,
                     net::RequestPriority priority);
   virtual ~URLRequestAdapter();
 
   // Sets the request method GET, POST etc
   void SetMethod(const std::string& method);
 
   // Adds a header to the request
   void AddHeader(const std::string& name, const std::string& value);
 
   // Sets the contents of the POST or PUT request
   void SetUploadContent(const char* bytes, int bytes_len);
 
   // Sets the request to streaming upload.
   void SetUploadChannel(JNIEnv* env, int64 content_length);
 
+  // Indicates that the request body will be streamed by calling AppendChunk()
+  // repeatedly. This must be called before Start().
+  void EnableChunkedUpload();
+
+  // Appends a chunk to the POST body
+  // This must be called after EnableChunkedUpload() and Start().
+  void AppendChunk(const char* bytes, int bytes_len, bool is_last_chunk);
+
   // Starts the request.
   void Start();
 
   // Cancels the request.
   void Cancel();
 
   // Releases all resources for the request and deletes the object itself.
   void Destroy();
 
   // Returns the URL of the request.
@@ skipping 13 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;
 
+  // Gets all headers.
+  bool GetFullRequestHeaders(net::HttpRequestHeaders* headers) const;

[mef, 2014/08/15 13:30:22]

This is already there (see 'ChromiumUrlRequest.getAllHeaders').

[mdumitrescu, 2014/08/15 15:23:13]

That returns the response headers. We need the request headers as well.

[mef, 2014/08/15 15:42:52]

Could you elaborate? What's your scenario and what are you planning to do with
those?
Specifically, when are you going to call this method?

+
   // 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;
 
   virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
 
   virtual void OnReadCompleted(net::URLRequest* request,
                                int bytes_read) OVERRIDE;
@@ skipping 21 matching lines @@
   net::URLRequest* url_request_;
   scoped_ptr<net::UploadDataStream> upload_data_stream_;
   scoped_refptr<net::GrowableIOBuffer> read_buffer_;
   int bytes_read_;
   int total_bytes_read_;
   int error_code_;
   int http_status_code_;
   std::string content_type_;
   bool canceled_;
   int64 expected_size_;
+  bool chunked_upload_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_URL_REQUEST_ADAPTER_H_