[Cronet] Upload support for async APIs

components/cronet/android/cronet_url_request_adapter.cc

Index: components/cronet/android/cronet_url_request_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_adapter.cc b/components/cronet/android/cronet_url_request_adapter.cc
index 265895af4512a5ab4f932c5d8e4d9a1942f6799e..5e708834e75b344363c477f0b8bb18667ebe7dfe 100644
--- a/components/cronet/android/cronet_url_request_adapter.cc
+++ b/components/cronet/android/cronet_url_request_adapter.cc
@@ -35,12 +35,6 @@ CronetURLRequestAdapter::~CronetURLRequestAdapter() {
   DCHECK(IsOnNetworkThread());
 }
 
-void CronetURLRequestAdapter::AddRequestHeader(const std::string& name,
-                                               const std::string& value) {
-  DCHECK(!IsOnNetworkThread());
-  initial_request_headers_.SetHeader(name, value);
-}
-
 bool CronetURLRequestAdapter::PostTaskToNetworkThread(
     const tracked_objects::Location& from_here,
     const base::Closure& task) {
@@ -52,6 +46,24 @@ bool CronetURLRequestAdapter::IsOnNetworkThread() const {
   return context_->GetNetworkTaskRunner()->BelongsToCurrentThread();
 }
 
+void CronetURLRequestAdapter::AddRequestHeader(const std::string& name,
+                                               const std::string& value) {
+  DCHECK(!IsOnNetworkThread());
+  initial_request_headers_.SetHeader(name, value);
+}
+
+void CronetURLRequestAdapter::SetUpload(
+    scoped_ptr<net::UploadDataStream> upload) {
+  DCHECK(!IsOnNetworkThread());
+  DCHECK(!upload_.get());
+  upload_ = upload.Pass();
+}
+
+// For testing.
+net::UploadDataStream* CronetURLRequestAdapter::GetUpload() {

[mef, 2015/02/02 17:45:11]

nit: GetUploadForTesting?

[xunjieli, 2015/02/02 18:25:41]

Done.

+  return upload_.get();
+}
+
 void CronetURLRequestAdapter::Start() {
   DCHECK(IsOnNetworkThread());
   VLOG(1) << "Starting chromium request: "
@@ -63,6 +75,8 @@ void CronetURLRequestAdapter::Start() {
   url_request_->set_method(initial_method_);
   url_request_->SetExtraRequestHeaders(initial_request_headers_);
   url_request_->SetPriority(initial_priority_);
+  if (upload_)
+    url_request_->set_upload(upload_.Pass());
   url_request_->Start();
 }