Make URLRequestContextAdapter initialization asynchronous

components/cronet/android/url_request_adapter.cc

 // 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.
 
 #include "url_request_adapter.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 58 matching lines @@
 
 void URLRequestAdapter::EnableChunkedUpload() {
   chunked_upload_ = true;
 }
 
 void URLRequestAdapter::AppendChunk(const char* bytes, int bytes_len,
                                     bool is_last_chunk) {
   VLOG(1) << "AppendChunk, len: " << bytes_len << ", last: " << is_last_chunk;
   scoped_ptr<char[]> buf(new char[bytes_len]);
   memcpy(buf.get(), bytes, bytes_len);
-  context_->GetNetworkTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&URLRequestAdapter::OnAppendChunk,
-                 base::Unretained(this),
-                 Passed(buf.Pass()),
-                 bytes_len,
-                 is_last_chunk));
+  context_->RunTask(base::Bind(&URLRequestAdapter::OnAppendChunk,
+                               base::Unretained(this),
+                               Passed(buf.Pass()),
+                               bytes_len,
+                               is_last_chunk));
 }
 
 std::string URLRequestAdapter::GetHeader(const std::string& name) const {
   std::string value;
   if (url_request_ != NULL) {
     url_request_->GetResponseHeaderByName(name, &value);
   }
   return value;
 }
 
 net::HttpResponseHeaders* URLRequestAdapter::GetResponseHeaders() const {
   if (url_request_ == NULL) {
     return NULL;
   }
   return url_request_->response_headers();
 }
 
 std::string URLRequestAdapter::GetNegotiatedProtocol() const {
   if (url_request_ == NULL)
     return std::string();
   return url_request_->response_info().npn_negotiated_protocol;
 }
 
 void URLRequestAdapter::Start() {
-  context_->GetNetworkTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&URLRequestAdapter::OnInitiateConnection,
-                 base::Unretained(this)));
+  context_->RunTask(base::Bind(&URLRequestAdapter::OnInitiateConnection,
+                               base::Unretained(this)));
 }
 
 void URLRequestAdapter::OnAppendChunk(const scoped_ptr<char[]> bytes,
                                       int bytes_len, bool is_last_chunk) {
   url_request_->AppendChunkToUpload(bytes.get(), bytes_len, is_last_chunk);
 }
 
 void URLRequestAdapter::OnInitiateConnection() {
   if (canceled_) {
     return;
@@ skipping 27 matching lines @@
   url_request_->Start();
 }
 
 void URLRequestAdapter::Cancel() {
   if (canceled_) {
     return;
   }
 
   canceled_ = true;
 
-  context_->GetNetworkTaskRunner()->PostTask(
-      FROM_HERE,
+  context_->RunTask(
       base::Bind(&URLRequestAdapter::OnCancelRequest, base::Unretained(this)));
 }
 
 void URLRequestAdapter::OnCancelRequest() {
   VLOG(1) << "Canceling chromium request: " << url_.possibly_invalid_spec();
 
   if (url_request_ != NULL) {
     url_request_->Cancel();
   }
 
   OnRequestCanceled();
 }
 
 void URLRequestAdapter::Destroy() {
   context_->GetNetworkTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&URLRequestAdapter::OnDestroyRequest, this));

[mmenke, 2014/10/02 22:11:52]

Sorry, this should also use RunTask, as it's theoretically possible to even
destroy an adapter before the context is initialized.

[xunjieli, 2014/10/03 14:32:55]

Done.

 }
 
 // static
 void URLRequestAdapter::OnDestroyRequest(URLRequestAdapter* self) {
   VLOG(1) << "Destroying chromium request: "
           << self->url_.possibly_invalid_spec();
   delete self;
 }
 
 void URLRequestAdapter::OnResponseStarted(net::URLRequest* request) {
@@ skipping 101 matching lines @@
 
   delegate_->OnBytesRead(this);
   delegate_->OnRequestFinished(this);
 }
 
 unsigned char* URLRequestAdapter::Data() const {
   return reinterpret_cast<unsigned char*>(read_buffer_->StartOfBuffer());
 }
 
 }  // namespace cronet