Initial implementation of Cronet Async API.

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
new file mode 100644
index 0000000000000000000000000000000000000000..dbd7913fae8c52f74b57c3e4a337395913b7f99a
--- /dev/null
+++ b/components/cronet/android/cronet_url_request_adapter.cc
@@ -0,0 +1,206 @@
+// 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 "cronet_url_request_adapter.h"
+
+#include "base/bind.h"
+#include "base/location.h"
+#include "base/logging.h"
+#include "components/cronet/android/cronet_url_request_context_adapter.h"
+#include "components/cronet/android/wrapped_channel_upload_element_reader.h"
+#include "net/base/io_buffer.h"
+#include "net/base/load_flags.h"
+#include "net/http/http_status_code.h"
+#include "net/url_request/redirect_info.h"
+#include "net/url_request/url_request_context.h"
+
+namespace cronet {
+
+static const size_t kBufferSizeIncrement = 32768;

[mmenke, 2014/10/31 19:16:22]

size_t -> int (IOBuffers use integer sizes - results are always ints, so can
indicate we read any more than that, anyways)

[mmenke, 2014/10/31 19:16:22]

nit:  Maybe kReadBufferSize?  We never increment the buffer size.

[mef, 2014/10/31 20:39:15]

Done.

[mef, 2014/10/31 20:39:15]

Done.

+
+CronetURLRequestAdapter::CronetURLRequestAdapter(
+    CronetURLRequestContextAdapter* context,
+    CronetURLRequestAdapterDelegate* delegate,
+    const GURL& url,
+    net::RequestPriority priority)
+    : initial_method_("GET"),
+      read_buffer_(new net::IOBufferWithSize(kBufferSizeIncrement)) {
+  context_ = context;
+  delegate_ = delegate;
+  initial_url_ = url;
+  initial_priority_ = priority;

[mmenke, 2014/10/31 19:16:22]

These should all be in the initializer list (And most of them should probably be
const)

[mef, 2014/10/31 20:39:15]

Done.

+}
+
+CronetURLRequestAdapter::~CronetURLRequestAdapter() {
+  url_request_.reset();

[mmenke, 2014/10/31 19:16:22]

Not needed - that's what scoped_ptrs are for.  :)

[mef, 2014/10/31 20:39:15]

Done.

+}
+
+void CronetURLRequestAdapter::SetMethod(const std::string& method) {
+  initial_method_ = method;
+}
+
+void CronetURLRequestAdapter::AddRequestHeader(const std::string& name,
+                                               const std::string& value) {
+  initial_request_headers_.SetHeader(name, value);
+}
+
+net::HttpResponseHeaders* CronetURLRequestAdapter::GetResponseHeaders() const {
+  DCHECK(IsOnNetworkThread());
+  if (url_request_ == NULL)
+    return NULL;

[mmenke, 2014/10/31 19:16:22]

Do we ever call any of these when the request is NULL?  Since they're called
from the adapter on the network thread during a callback from the url_request_,
I don't think so, so none of these checks should be needed.

[mef, 2014/10/31 20:39:15]

Done.

+  return url_request_->response_headers();
+}
+
+std::string CronetURLRequestAdapter::GetNegotiatedProtocol() const {
+  DCHECK(IsOnNetworkThread());
+  if (url_request_ == NULL)
+    return std::string();
+  return url_request_->response_info().npn_negotiated_protocol;
+}
+
+bool CronetURLRequestAdapter::GetWasCached() const {
+  DCHECK(IsOnNetworkThread());
+  if (url_request_ == NULL)
+    return false;
+  return url_request_->response_info().was_cached;
+}
+
+int64 CronetURLRequestAdapter::GetTotalReceivedBytes() const {
+  DCHECK(IsOnNetworkThread());
+  if (url_request_ == NULL)
+    return 0;
+  return url_request_->GetTotalReceivedBytes();
+}
+
+void CronetURLRequestAdapter::Start() {
+  DCHECK(!IsOnNetworkThread());
+  context_->GetNetworkTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&CronetURLRequestAdapter::StartOnNetworkThread,
+                 base::Unretained(this)));
+}
+
+void CronetURLRequestAdapter::FollowDeferredRedirect() {
+  DCHECK(!IsOnNetworkThread());
+  context_->GetNetworkTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(
+          &CronetURLRequestAdapter::FollowDeferredRedirectOnNetworkThread,
+          base::Unretained(this)));
+}
+
+// Receive more data.
+void CronetURLRequestAdapter::ReadData() {
+  DCHECK(!IsOnNetworkThread());
+  context_->GetNetworkTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&CronetURLRequestAdapter::ReadDataOnNetworkThread,
+                 base::Unretained(this)));
+}
+
+void CronetURLRequestAdapter::Destroy() {
+  DCHECK(!IsOnNetworkThread());
+  context_->GetNetworkTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&CronetURLRequestAdapter::DestroyOnNetworkThread,
+                 base::Unretained(this)));
+}
+
+// net::URLRequest::Delegate overrides (called on network thread).

[mmenke, 2014/10/31 19:16:22]

nit:  This applies to multiple methods, so should add a blank line below it.

[mef, 2014/10/31 20:39:15]

Done.

+void CronetURLRequestAdapter::OnReceivedRedirect(
+    net::URLRequest* request,
+    const net::RedirectInfo& redirect_info,
+    bool* defer_redirect) {
+  DCHECK(IsOnNetworkThread());
+  DCHECK(request->status().is_success());
+  delegate_->OnRedirect(redirect_info.new_url, redirect_info.status_code);
+  *defer_redirect = true;
+}
+
+void CronetURLRequestAdapter::OnResponseStarted(net::URLRequest* request) {
+  DCHECK(IsOnNetworkThread());
+  if (!CheckStatus(request))
+    return;
+  delegate_->OnResponseStarted(request->GetResponseCode());
+}
+
+void CronetURLRequestAdapter::OnReadCompleted(net::URLRequest* request,
+                                              int bytes_read) {
+  DCHECK(IsOnNetworkThread());
+  if (!CheckStatus(request))
+    return;
+  if (bytes_read != 0) {
+    delegate_->OnBytesRead(Data(), bytes_read);
+  } else {
+    delegate_->OnRequestFinished();
+  }
+}
+
+bool CronetURLRequestAdapter::IsOnNetworkThread() const {
+  return context_->GetNetworkTaskRunner()->BelongsToCurrentThread();
+}
+
+void CronetURLRequestAdapter::StartOnNetworkThread() {
+  DCHECK(IsOnNetworkThread());
+  VLOG(1) << "Starting chromium request: "
+          << initial_url_.possibly_invalid_spec().c_str()
+          << " priority: " << RequestPriorityToString(initial_priority_);
+  url_request_ = context_->GetURLRequestContext()->CreateRequest(
+      initial_url_, net::DEFAULT_PRIORITY, this, NULL);
+  url_request_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
+                             net::LOAD_DO_NOT_SAVE_COOKIES |
+                             net::LOAD_DO_NOT_SEND_COOKIES);
+  url_request_->set_method(initial_method_);
+  url_request_->SetExtraRequestHeaders(initial_request_headers_);
+  url_request_->SetPriority(initial_priority_);
+  url_request_->Start();
+}
+
+void CronetURLRequestAdapter::FollowDeferredRedirectOnNetworkThread() {
+  DCHECK(IsOnNetworkThread());
+
+  url_request_->FollowDeferredRedirect();
+}
+
+// Reads all available data or starts an asynchronous read.
+void CronetURLRequestAdapter::ReadDataOnNetworkThread() {
+  DCHECK(IsOnNetworkThread());
+  int bytes_read = 0;
+  // If read completes synchronously, pass data to delegate.
+  if (url_request_->Read(
+          read_buffer_.get(), read_buffer_->size(), &bytes_read)) {
+    OnReadCompleted(url_request_.get(), bytes_read);
+  } else if (url_request_->status().status() !=
+             net::URLRequestStatus::IO_PENDING) {
+    OnReadCompleted(url_request_.get(), -1);
+  }
+}
+
+void CronetURLRequestAdapter::DestroyOnNetworkThread() {
+  DCHECK(IsOnNetworkThread());
+  VLOG(1) << "Destroy chromium request: " <<
+      initial_url_.possibly_invalid_spec();
+
+  if (url_request_ != NULL)
+    url_request_->Cancel();

[mmenke, 2014/10/31 19:16:22]

This isn't needed - requests call cancel on destruction, anyways (And don't call
into their delegate).

[mef, 2014/10/31 20:39:15]

Done.

+
+  delete this;
+}
+
+bool CronetURLRequestAdapter::CheckStatus(net::URLRequest* request) {

[mmenke, 2014/10/31 19:16:22]

Maybe call this MaybeReportError (Or failure?)  Not clear from the name that is
actually does something if it detects an error.

[mef, 2014/10/31 20:39:15]

Done.

+  DCHECK_NE(net::URLRequestStatus::IO_PENDING, url_request_->status().status());
+  DCHECK_EQ(request, url_request_);
+  if (url_request_->status().is_success())
+    return true;
+  VLOG(1) << "Error " << url_request_->status().error()
+          << " on chromium request: " << initial_url_.possibly_invalid_spec();
+  delegate_->OnError(url_request_->status().error());
+  return false;
+}
+
+unsigned char* CronetURLRequestAdapter::Data() const {
+  return reinterpret_cast<unsigned char*>(read_buffer_->data());
+}
+
+}  // namespace cronet