Initial implementation of Cronet Async API.

components/cronet/android/cronet_url_request.cc

Index: components/cronet/android/cronet_url_request.cc
diff --git a/components/cronet/android/cronet_url_request.cc b/components/cronet/android/cronet_url_request.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cce8fc0a9e83109d5c3f8922f0cae1e2c1e3d111
--- /dev/null
+++ b/components/cronet/android/cronet_url_request.cc
@@ -0,0 +1,283 @@
+// 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 "components/cronet/android/cronet_url_request.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "components/cronet/android/cronet_url_request_adapter.h"
+#include "components/cronet/android/cronet_url_request_context_adapter.h"
+#include "jni/CronetUrlRequest_jni.h"
+#include "net/base/net_errors.h"
+#include "net/base/request_priority.h"
+#include "net/http/http_response_headers.h"
+
+using base::android::ConvertUTF8ToJavaString;
+
+namespace cronet {
+namespace {
+
+net::RequestPriority ConvertRequestPriority(jint request_priority) {
+  switch (request_priority) {
+    case CRONET_REQUEST_PRIORITY_IDLE:
+      return net::IDLE;
+    case CRONET_REQUEST_PRIORITY_LOWEST:
+      return net::LOWEST;
+    case CRONET_REQUEST_PRIORITY_LOW:
+      return net::LOW;
+    case CRONET_REQUEST_PRIORITY_MEDIUM:
+      return net::MEDIUM;
+    case CRONET_REQUEST_PRIORITY_HIGHEST:
+      return net::HIGHEST;
+    default:
+      return net::LOWEST;
+  }
+}
+
+// A delegate of CronetURLRequestAdapter that delivers callbacks to the Java
+// layer. Always called on Network Thread.
+class JniCronetURLRequestAdapterDelegate
+    : public CronetURLRequestAdapter::CronetURLRequestAdapterDelegate {
+ public:
+  JniCronetURLRequestAdapterDelegate(JNIEnv* jenv, jobject jowner) {
+    owner_.Reset(jenv, jowner);
+  }
+
+  void OnRedirect(CronetURLRequestAdapter* request_adapter,
+                  const GURL& new_location) override {
+    JNIEnv* jenv = base::android::AttachCurrentThread();
+    cronet::Java_CronetUrlRequest_onRedirect(
+        jenv,
+        owner_.obj(),
+        ConvertUTF8ToJavaString(jenv, new_location.spec()).Release());
+  }
+
+  void OnResponseStarted(CronetURLRequestAdapter* request_adapter) override {
+    JNIEnv* jenv = base::android::AttachCurrentThread();
+    cronet::Java_CronetUrlRequest_onResponseStarted(jenv, owner_.obj());
+  }
+
+  void OnBytesRead(CronetURLRequestAdapter* request_adapter,
+                   int bytes_read) override {
+    JNIEnv* jenv = base::android::AttachCurrentThread();
+    base::android::ScopedJavaLocalRef<jobject> java_buffer(
+        jenv, jenv->NewDirectByteBuffer(request_adapter->Data(), bytes_read));
+    cronet::Java_CronetUrlRequest_onDataReceived(
+        jenv, owner_.obj(), java_buffer.obj());
+  }
+
+  void OnRequestCanceled(CronetURLRequestAdapter* request_adapter) override {
+    JNIEnv* jenv = base::android::AttachCurrentThread();
+    cronet::Java_CronetUrlRequest_onCanceled(jenv, owner_.obj());
+  }
+
+  void OnRequestFinished(CronetURLRequestAdapter* request_adapter) override {
+    JNIEnv* jenv = base::android::AttachCurrentThread();
+    cronet::Java_CronetUrlRequest_onComplete(jenv, owner_.obj());
+  }
+
+  void OnError(CronetURLRequestAdapter* request_adapter, int error) override {
+    JNIEnv* jenv = base::android::AttachCurrentThread();
+    cronet::Java_CronetUrlRequest_onError(
+        jenv,
+        owner_.obj(),
+        error,
+        ConvertUTF8ToJavaString(jenv, net::ErrorToString(error)).Release());
+  }
+
+ protected:
+  virtual ~JniCronetURLRequestAdapterDelegate() {
+  }
+
+ private:
+  base::android::ScopedJavaGlobalRef<jobject> owner_;
+
+  DISALLOW_COPY_AND_ASSIGN(JniCronetURLRequestAdapterDelegate);
+};
+
+}  // namespace
+
+// Explicitly register static JNI functions.
+bool CronetUrlRequestRegisterJni(JNIEnv* jenv) {
+  return RegisterNativesImpl(jenv);
+}
+
+static jlong CreateRequestAdapter(JNIEnv* jenv,
+                                  jobject jurl_request,
+                                  jlong jurl_request_context_adapter,
+                                  jstring jurl_string,
+                                  jint jpriority) {
+  CronetURLRequestContextAdapter* context_adapter =
+      reinterpret_cast<CronetURLRequestContextAdapter*>(
+          jurl_request_context_adapter);
+  DCHECK(context_adapter != nullptr);
+
+  GURL url(base::android::ConvertJavaStringToUTF8(jenv, jurl_string));
+
+  VLOG(1) << "New chromium network request_adapter: "
+          << url.possibly_invalid_spec();
+
+  CronetURLRequestAdapter* adapter = new CronetURLRequestAdapter(
+      context_adapter,
+      new JniCronetURLRequestAdapterDelegate(jenv, jurl_request),
+      url,
+      ConvertRequestPriority(jpriority));
+
+  return reinterpret_cast<jlong>(adapter);
+}
+
+static void AddHeader(JNIEnv* jenv,
+                      jobject jurl_request,
+                      jlong jurl_request_adapter,
+                      jstring jname,
+                      jstring jvalue) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  std::string name(base::android::ConvertJavaStringToUTF8(jenv, jname));
+  std::string value(base::android::ConvertJavaStringToUTF8(jenv, jvalue));
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());

[mmenke, 2014/10/21 16:17:53]

Check IsValidHeaderName and IsValidHeaderValue, and if not, return false and
throw an exception?

[mmenke, 2014/10/21 17:39:18]

Oh, and we should have tests for these (And most other cases where we throw
exceptions as well - though checking that ever single method throws an exception
if called after a request starts is probably a bit excessive)

[mef, 2014/10/21 21:27:47]

Done.

+  request_adapter->AddRequestHeader(name, value);
+}
+
+static void SetHttpMethod(JNIEnv* jenv,
+                          jobject jurl_request,
+                          jlong jurl_request_adapter,
+                          jstring jmethod) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  std::string method(base::android::ConvertJavaStringToUTF8(jenv, jmethod));
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());
+  request_adapter->SetMethod(method);
+}
+
+static void Start(JNIEnv* jenv,
+                  jobject jurl_request,
+                  jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());
+  request_adapter->Start();
+}
+
+static void DestroyRequestAdapter(JNIEnv* jenv,
+                                  jobject jurl_request,
+                                  jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());
+  request_adapter->Destroy();
+}
+
+static void Cancel(JNIEnv* jenv,
+                   jobject jurl_request,
+                   jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());
+  request_adapter->Cancel();
+}
+
+static void ReceiveData(JNIEnv* jenv,
+                        jobject jcaller,
+                        jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());
+  request_adapter->ReadData();
+}
+
+static void FollowDeferredRedirect(JNIEnv* jenv,
+                                   jobject jcaller,
+                                   jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(!request_adapter->IsOnNetworkThread());
+  request_adapter->FollowDeferredRedirect();
+}
+
+static jint GetHttpStatusCode(JNIEnv* jenv,
+                              jobject jurl_request,
+                              jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(request_adapter->IsOnNetworkThread());
+  return request_adapter->http_status_code();
+}
+
+static void GetAllHeaders(JNIEnv* jenv,

[mmenke, 2014/10/21 16:17:53]

optional:  May want to rename this (All the other GetBlah functions return Blah,
but this behaves a bit differently).  Could just call it PopulateResponseHeaders
or somesuch.

[mef, 2014/10/21 21:27:47]

Done.

+                          jobject jurl_request,
+                          jlong jurl_request_adapter,
+                          jobject jheaders_map) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(request_adapter->IsOnNetworkThread());
+
+  net::HttpResponseHeaders* headers = request_adapter->GetResponseHeaders();
+  if (headers == nullptr)
+    return;
+
+  void* iter = nullptr;
+  std::string header_name;
+  std::string header_value;
+  while (headers->EnumerateHeaderLines(&iter, &header_name, &header_value)) {
+    ScopedJavaLocalRef<jstring> name =
+        ConvertUTF8ToJavaString(jenv, header_name);
+    ScopedJavaLocalRef<jstring> value =
+        ConvertUTF8ToJavaString(jenv, header_value);
+    Java_CronetUrlRequest_onAppendResponseHeader(
+        jenv, jurl_request, jheaders_map, name.Release(), value.Release());
+  }
+
+  // Some implementations (notably HttpURLConnection) include a mapping for the
+  // null key; in HTTP's case, this maps to the HTTP status line.

[mmenke, 2014/10/21 16:17:53]

Maybe get rid of this behavior, and make the status line separately accessible? 
As-is, this seems like a bit of a hack to me.

[mef, 2014/10/21 21:27:47]

Acknowledged.

+  ScopedJavaLocalRef<jstring> status_line =
+      ConvertUTF8ToJavaString(jenv, headers->GetStatusLine());
+  Java_CronetUrlRequest_onAppendResponseHeader(
+      jenv, jurl_request, jheaders_map, nullptr, status_line.Release());
+}
+
+static jstring GetNegotiatedProtocol(JNIEnv* jenv,
+                                     jobject jurl_request,
+                                     jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(request_adapter->IsOnNetworkThread());
+  std::string negotiated_protocol = request_adapter->GetNegotiatedProtocol();
+  return ConvertUTF8ToJavaString(jenv, negotiated_protocol.c_str()).Release();
+}
+
+static jboolean GetWasCached(JNIEnv* jenv,
+                             jobject jurl_request,
+                             jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(request_adapter->IsOnNetworkThread());
+  return request_adapter->GetWasCached() ? JNI_TRUE : JNI_FALSE;
+}
+
+static jlong GetTotalReceivedBytes(JNIEnv* jenv,
+                                   jobject jurl_request,
+                                   jlong jurl_request_adapter) {
+  CronetURLRequestAdapter* request_adapter =
+      reinterpret_cast<CronetURLRequestAdapter*>(jurl_request_adapter);
+  DCHECK(request_adapter);
+  DCHECK(request_adapter->IsOnNetworkThread());
+  return request_adapter->GetTotalReceivedBytes();
+}
+
+}  // namespace cronet