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"
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/cronet/android/url_request_context_adapter.h"
 #include "components/cronet/android/wrapped_channel_upload_element_reader.h"
 #include "net/base/load_flags.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/http/http_status_code.h"
 
 namespace cronet {
 
 static const size_t kBufferSizeIncrement = 8192;
@@ skipping 11 matching lines @@
       canceled_(false),
       expected_size_(0),
       chunked_upload_(false) {
   context_ = context;
   delegate_ = delegate;
   url_ = url;
   priority_ = priority;
 }
 
 URLRequestAdapter::~URLRequestAdapter() {
+  DCHECK(OnNetworkThread());
   CHECK(url_request_ == NULL);
 }
 
 void URLRequestAdapter::SetMethod(const std::string& method) {
   method_ = method;
 }
 
 void URLRequestAdapter::AddHeader(const std::string& name,
                                   const std::string& value) {
   headers_.SetHeader(name, value);
@@ skipping 16 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,
+  context_->RunTaskAfterContextInit(
       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_->RunTaskAfterContextInit(base::Bind(
+      &URLRequestAdapter::OnInitiateConnection, base::Unretained(this)));
 }
 
 void URLRequestAdapter::OnAppendChunk(const scoped_ptr<char[]> bytes,
                                       int bytes_len, bool is_last_chunk) {
+  DCHECK(OnNetworkThread());
   url_request_->AppendChunkToUpload(bytes.get(), bytes_len, is_last_chunk);
 }
 
 void URLRequestAdapter::OnInitiateConnection() {
+  DCHECK(OnNetworkThread());
   if (canceled_) {
     return;
   }
 
   VLOG(1) << "Starting chromium request: "
           << url_.possibly_invalid_spec().c_str()
           << " priority: " << RequestPriorityToString(priority_);
   url_request_ = context_->GetURLRequestContext()->CreateRequest(
       url_, net::DEFAULT_PRIORITY, this, NULL);
   url_request_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
@@ skipping 19 matching lines @@
   url_request_->Start();
 }
 
 void URLRequestAdapter::Cancel() {
   if (canceled_) {
     return;
   }
 
   canceled_ = true;
 
-  context_->GetNetworkTaskRunner()->PostTask(
-      FROM_HERE,
+  context_->RunTaskAfterContextInit(

[mef, 2014/10/10 15:06:27]

Does it make sense to make |RunTaskAfterContextInit| name also reflect the fact
that tasks is going to run on network thread?

Maybe call it |PostTaskToNetworkThread|? This would match |OnNetworkThread|
check.

[xunjieli, 2014/10/10 17:25:45]

Done. The "run after context init" part is sort of lost in the new function
name, but I think |PostTaskToNetworkThread| does sound cleaner.

       base::Bind(&URLRequestAdapter::OnCancelRequest, base::Unretained(this)));
 }
 
 void URLRequestAdapter::OnCancelRequest() {
+  DCHECK(OnNetworkThread());
   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));
+  context_->RunTaskAfterContextInit(
+      base::Bind(&URLRequestAdapter::OnDestroyRequest, this));
 }
 
 // static
 void URLRequestAdapter::OnDestroyRequest(URLRequestAdapter* self) {
+  DCHECK(self->OnNetworkThread());
   VLOG(1) << "Destroying chromium request: "
           << self->url_.possibly_invalid_spec();
   delete self;
 }
 
+// static
 void URLRequestAdapter::OnResponseStarted(net::URLRequest* request) {
+  DCHECK(OnNetworkThread());
   if (request->status().status() != net::URLRequestStatus::SUCCESS) {
     OnRequestFailed();
     return;
   }
 
   http_status_code_ = request->GetResponseCode();
   VLOG(1) << "Response started with status: " << http_status_code_;
 
   request->GetResponseHeaderByName("Content-Type", &content_type_);
   expected_size_ = request->GetExpectedContentSize();
   delegate_->OnResponseStarted(this);
 
   Read();
 }
 
 // Reads all available data or starts an asynchronous read.
 void URLRequestAdapter::Read() {
+  DCHECK(OnNetworkThread());
   while (true) {
     if (read_buffer_->RemainingCapacity() == 0) {
       int new_capacity = read_buffer_->capacity() + kBufferSizeIncrement;
       read_buffer_->SetCapacity(new_capacity);
     }
 
     int bytes_read;
     if (url_request_->Read(
             read_buffer_, read_buffer_->RemainingCapacity(), &bytes_read)) {
       if (bytes_read == 0) {
@@ skipping 16 matching lines @@
       break;
     } else {
       OnRequestFailed();
       break;
     }
   }
 }
 
 void URLRequestAdapter::OnReadCompleted(net::URLRequest* request,
                                         int bytes_read) {
+  DCHECK(OnNetworkThread());
   VLOG(1) << "Asynchronously read: " << bytes_read << " bytes";
   if (bytes_read < 0) {
     OnRequestFailed();
     return;
   } else if (bytes_read == 0) {
     OnRequestSucceeded();
     return;
   }
 
   OnBytesRead(bytes_read);
   Read();
 }
 
 void URLRequestAdapter::OnBytesRead(int bytes_read) {
+  DCHECK(OnNetworkThread());
   read_buffer_->set_offset(read_buffer_->offset() + bytes_read);
   bytes_read_ += bytes_read;
   total_bytes_read_ += bytes_read;
 }
 
 void URLRequestAdapter::OnRequestSucceeded() {
+  DCHECK(OnNetworkThread());
   if (canceled_) {
     return;
   }
 
   VLOG(1) << "Request completed with HTTP status: " << http_status_code_
           << ". Total bytes read: " << total_bytes_read_;
 
   OnRequestCompleted();
 }
 
 void URLRequestAdapter::OnRequestFailed() {
+  DCHECK(OnNetworkThread());
   if (canceled_) {
     return;
   }
 
   error_code_ = url_request_->status().error();
   VLOG(1) << "Request failed with status: " << url_request_->status().status()
           << " and error: " << net::ErrorToString(error_code_);
   OnRequestCompleted();
 }
 
 void URLRequestAdapter::OnRequestCanceled() {
+  DCHECK(OnNetworkThread());
   OnRequestCompleted();
 }
 
 void URLRequestAdapter::OnRequestCompleted() {
+  DCHECK(OnNetworkThread());
   VLOG(1) << "Completed: " << url_.possibly_invalid_spec();
   url_request_.reset();
 
   delegate_->OnBytesRead(this);
   delegate_->OnRequestFinished(this);
 }
 
 unsigned char* URLRequestAdapter::Data() const {
+  DCHECK(OnNetworkThread());
   return reinterpret_cast<unsigned char*>(read_buffer_->StartOfBuffer());
 }
 
+bool URLRequestAdapter::OnNetworkThread() const {
+  return context_->GetNetworkTaskRunner()->BelongsToCurrentThread();
+}
+
 }  // namespace cronet