This CL uses @NativeClassQualifiedName in

CronetUrlRequest.java to reduce JNI code. After the
refactoring, cronet_url_request.cc is merged with
cronet_url_request_adapter.cc, since the former mostly
contains JNI code that can be generated by
@NativeClassQualifiedName.
This CL also inlines CronetUrlRequestAdapterDelegate, since
we have only one file now.

BUG=458276

Review URL: https://codereview.chromium.org/923213002

Cr-Commit-Position: refs/heads/master@{#323976}

components/cronet/android/cronet_library_loader.cc

@@ -18,7 +18,7 @@
 #include "components/cronet/android/chromium_url_request_context.h"
 #include "components/cronet/android/cronet_histogram_manager.h"
 #include "components/cronet/android/cronet_upload_data_stream_delegate.h"
-#include "components/cronet/android/cronet_url_request.h"
+#include "components/cronet/android/cronet_url_request_adapter.h"
 #include "components/cronet/android/cronet_url_request_context_adapter.h"
 #include "jni/CronetLibraryLoader_jni.h"
 #include "net/android/net_jni_registrar.h"
@@ -42,7 +42,7 @@ const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
     {"CronetLibraryLoader", RegisterNativesImpl},
     {"CronetUploadDataStreamDelegate",
      CronetUploadDataStreamDelegateRegisterJni},
-    {"CronetUrlRequest", CronetUrlRequestRegisterJni},
+    {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni},
     {"CronetUrlRequestContextAdapter",
      CronetUrlRequestContextAdapterRegisterJni},
     {"NetAndroid", net::android::RegisterJni},

components/cronet/android/cronet_url_request.h

-// 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.
-
-#ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_
-#define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_
-
-#include <jni.h>
-
-namespace cronet {
-
-bool CronetUrlRequestRegisterJni(JNIEnv* env);
-
-}  // namespace cronet
-
-#endif  // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_H_

components/cronet/android/cronet_url_request_adapter.h

@@ -5,14 +5,17 @@
 #ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_ADAPTER_H_
 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_ADAPTER_H_
 
+#include <jni.h>
 #include <string>
 
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/request_priority.h"
-#include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
@@ -22,6 +25,7 @@ class SingleThreadTaskRunner;
 
 namespace net {
 class GrowableIOBuffer;
+class HttpRequestHeaders;
 class HttpResponseHeaders;
 class UploadDataStream;
 }  // namespace net
@@ -30,106 +34,83 @@ namespace cronet {
 
 class CronetURLRequestContextAdapter;
 
-// An adapter from the JNI CronetUrlRequest object to the Chromium URLRequest.
-// Created and configured from random thread. Start is posted to network
-// thread and all callbacks into CronetURLRequestAdapterDelegate are done on
-// network thread. Each delegate callback is expected to initiate next step like
-// FollowDeferredRedirect, ReadData or Destroy. All methods except those needed
-// to set up a request must be called exclusively on the network thread.
+bool CronetUrlRequestAdapterRegisterJni(JNIEnv* env);
+
+// An adapter from Java CronetUrlRequest object to net::URLRequest.
+// Created and configured from a Java thread. Start, ReadData, and Destroy are
+// posted to network thread and all callbacks into the Java CronetUrlRequest are
+// done on the network thread. Java CronetUrlRequest is expected to initiate the
+// next step like FollowDeferredRedirect, ReadData or Destroy. Public methods
+// can be called on any thread except PopulateResponseHeaders and Get* methods,
+// which can only be called on the network thread.
 class CronetURLRequestAdapter : public net::URLRequest::Delegate {
  public:
-  // The delegate which is called when the request adapter completes a step.
-  // Always called on network thread.
-  class CronetURLRequestAdapterDelegate {
-   public:
-    // Called on redirect. Consumer should either destroy the request, or
-    // call FollowDeferredRedirect.
-    virtual void OnRedirect(const GURL& newLocation, int http_status_code) = 0;
-    // Called when response has started and headers have been received. Consumer
-    // should either destroy the request, or call ReadData.
-    virtual void OnResponseStarted(int http_status_code) = 0;
-    // Called when response bytes were read. Consumer should consume data and
-    // either destroy the request, or call ReadData. The request may only be
-    // destroyed after the embedder is done with |bytes|, as deleting the
-    // request frees the buffer.
-    virtual void OnBytesRead(unsigned char* bytes,
-                             int bytes_read) = 0;
-    // Called when response has finished successfully. Consumer should destroy
-    // the request.
-    virtual void OnRequestFinished() = 0;
-    // Called when response has finished with error. Consumer should destroy
-    // the request.
-    virtual void OnError(int net_error) = 0;
-
-    virtual ~CronetURLRequestAdapterDelegate() {}
-  };
-
-  CronetURLRequestAdapter(
-      CronetURLRequestContextAdapter* context,
-      scoped_ptr<CronetURLRequestAdapterDelegate> delegate,
-      const GURL& url,
-      net::RequestPriority priority);
+  CronetURLRequestAdapter(CronetURLRequestContextAdapter* context,
+                          JNIEnv* env,
+                          jobject jurl_request,
+                          const GURL& url,
+                          net::RequestPriority priority);
   ~CronetURLRequestAdapter() override;
 
   // Methods called prior to Start are never called on network thread.
 
   // Sets the request method GET, POST etc.
-  void set_method(const std::string& method) {
-    initial_method_ = method;
-  }
+  jboolean SetHttpMethod(JNIEnv* env, jobject jcaller, jstring jmethod);
 
   // Adds a header to the request before it starts.
-  void AddRequestHeader(const std::string& name, const std::string& value);
+  jboolean AddRequestHeader(JNIEnv* env,
+                            jobject jcaller,
+                            jstring jname,
+                            jstring jvalue);
+
+  // Bypasses cache. If context is not set up to use cache, this call has no
+  // effect.
+  void DisableCache(JNIEnv* env, jobject jcaller);
 
   // Adds a request body to the request before it starts.
   void SetUpload(scoped_ptr<net::UploadDataStream> upload);
 
-  // Methods called on any thread.
-
-  // Posts tasks to network thread.
-  void PostTaskToNetworkThread(const tracked_objects::Location& from_here,
-                               const base::Closure& task);
-
-  // Returns true if called on network thread.
-  bool IsOnNetworkThread() const;
-
-  // Methods called only on network thread.
-
   // Starts the request.
-  void Start();
+  void Start(JNIEnv* env, jobject jcaller);
 
   // Follows redirect.
-  void FollowDeferredRedirect();
+  void FollowDeferredRedirect(JNIEnv* env, jobject jcaller);
 
   // Reads more data.
-  void ReadData();
+  void ReadData(JNIEnv* env, jobject jcaller);
 
   // Releases all resources for the request and deletes the object itself.
-  void Destroy();
+  void Destroy(JNIEnv* env, jobject jcaller);
+
+  // Populate response headers on network thread.
+  void PopulateResponseHeaders(JNIEnv* env,
+                               jobject jcaller,
+                               jobject jheaders_list);
 
   // When called during a OnRedirect or OnResponseStarted callback, these
-  // methods return the corresponding response information.
+  // methods return the corresponding response information. These methods
+  // can only be called on the network thread.
 
-  // Gets all response headers, as a HttpResponseHeaders object. Returns NULL
-  // if the last attempted request received no headers.
-  const net::HttpResponseHeaders* GetResponseHeaders() const;
+  // Gets http status text from the response headers.
+  base::android::ScopedJavaLocalRef<jstring> GetHttpStatusText(
+      JNIEnv* env,
+      jobject jcaller) const;
 
   // Gets NPN or ALPN Negotiated Protocol (if any) from HttpResponseInfo.
-  const std::string& GetNegotiatedProtocol() const;
+  base::android::ScopedJavaLocalRef<jstring> GetNegotiatedProtocol(
+      JNIEnv* env,
+      jobject jcaller) const;
 
   // Returns true if response is coming from the cache.
-  bool GetWasCached() const;
+  jboolean GetWasCached(JNIEnv* env, jobject jcaller) const;
 
   // Gets the total amount of body data received from network after
-  // SSL/SPDY/QUIC decoding and proxy handling.  Basically the size of the body
+  // SSL/SPDY/QUIC decoding and proxy handling. Basically the size of the body
   // prior to decompression.
-  int64 GetTotalReceivedBytes() const;
+  int64 GetTotalReceivedBytes(JNIEnv* env, jobject jcaller) const;
 
-  // Bypasses cache. If context is not set up to use cache, this call has no
-  // effect.
-  void DisableCache();
+  // net::URLRequest::Delegate implementations:
 
-  // net::URLRequest::Delegate overrides.
   void OnReceivedRedirect(net::URLRequest* request,
                           const net::RedirectInfo& redirect_info,
                           bool* defer_redirect) override;
@@ -137,12 +118,19 @@ class CronetURLRequestAdapter : public net::URLRequest::Delegate {
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
 
  private:
+  void StartOnNetworkThread();
+  void FollowDeferredRedirectOnNetworkThread();
+  void ReadDataOnNetworkThread();
+  void DestroyOnNetworkThread();
+
   // Checks status of the request_adapter, return false if |is_success()| is
   // true, otherwise report error and cancel request_adapter.
   bool MaybeReportError(net::URLRequest* request) const;
 
   CronetURLRequestContextAdapter* context_;
-  scoped_ptr<CronetURLRequestAdapterDelegate> delegate_;
+
+  // Java object that owns this CronetURLRequestContextAdapter.
+  base::android::ScopedJavaGlobalRef<jobject> owner_;
 
   const GURL initial_url_;
   const net::RequestPriority initial_priority_;

components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java

@@ -9,6 +9,7 @@ import android.util.Pair;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.base.NativeClassQualifiedName;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -99,7 +100,7 @@ final class CronetUrlRequest implements UrlRequest {
                         destroyRequestAdapter();
                         return;
                     }
-                    nativeReceiveData(mUrlRequestAdapter);
+                    nativeReadData(mUrlRequestAdapter);
                 }
             } catch (Exception e) {
                 synchronized (mUrlRequestAdapterLock) {
@@ -291,7 +292,7 @@ final class CronetUrlRequest implements UrlRequest {
                             && !header.second.isEmpty()) {
                         hasContentType = true;
                     }
-                    if (!nativeAddHeader(mUrlRequestAdapter, header.first, header.second)) {
+                    if (!nativeAddRequestHeader(mUrlRequestAdapter, header.first, header.second)) {
                         destroyRequestAdapter();
                         throw new IllegalArgumentException(
                                 "Invalid header " + header.first + "=" + header.second);
@@ -423,7 +424,7 @@ final class CronetUrlRequest implements UrlRequest {
             if (mUrlRequestAdapter == 0) {
                 return;
             }
-            nativeDestroyRequestAdapter(mUrlRequestAdapter);
+            nativeDestroy(mUrlRequestAdapter);
             mRequestContext.onRequestDestroyed(this);
             mUrlRequestAdapter = 0;
         }
@@ -540,7 +541,7 @@ final class CronetUrlRequest implements UrlRequest {
                         if (isCanceled()) {
                             return;
                         }
-                        nativeReceiveData(mUrlRequestAdapter);
+                        nativeReadData(mUrlRequestAdapter);
                     }
                 } catch (Exception e) {
                     onListenerException(e);
@@ -657,30 +658,39 @@ final class CronetUrlRequest implements UrlRequest {
     private native long nativeCreateRequestAdapter(
             long urlRequestContextAdapter, String url, int priority);
 
-    private native boolean nativeAddHeader(long urlRequestAdapter, String name,
-            String value);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native boolean nativeSetHttpMethod(long nativePtr, String method);
 
-    private native boolean nativeSetHttpMethod(long urlRequestAdapter,
-            String method);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native boolean nativeAddRequestHeader(long nativePtr, String name, String value);
 
-    private native void nativeStart(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native void nativeDisableCache(long nativePtr);
 
-    private native void nativeDestroyRequestAdapter(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native void nativeStart(long nativePtr);
 
-    private native void nativeFollowDeferredRedirect(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native void nativeFollowDeferredRedirect(long nativePtr);
 
-    private native void nativeReceiveData(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native void nativeReadData(long nativePtr);
 
-    private native void nativePopulateResponseHeaders(long urlRequestAdapter,
-            HeadersList headers);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native void nativeDestroy(long nativePtr);
 
-    private native String nativeGetNegotiatedProtocol(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native void nativePopulateResponseHeaders(long nativePtr, HeadersList headers);
 
-    private native String nativeGetHttpStatusText(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native String nativeGetHttpStatusText(long nativePtr);
 
-    private native boolean nativeGetWasCached(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native String nativeGetNegotiatedProtocol(long nativePtr);
 
-    private native long nativeGetTotalReceivedBytes(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native boolean nativeGetWasCached(long nativePtr);
 
-    private native void nativeDisableCache(long urlRequestAdapter);
+    @NativeClassQualifiedName("CronetURLRequestAdapter")
+    private native long nativeGetTotalReceivedBytes(long nativePtr);
 }

components/cronet/cronet_static.gypi

@@ -29,8 +29,6 @@
     'android/cronet_upload_data_stream_adapter.h',
     'android/cronet_upload_data_stream_delegate.cc',
     'android/cronet_upload_data_stream_delegate.h',
-    'android/cronet_url_request.cc',
-    'android/cronet_url_request.h',
     'android/cronet_url_request_adapter.cc',
     'android/cronet_url_request_adapter.h',
     'android/cronet_url_request_context_adapter.cc',