Remove explicit JNI references by adding UrlRequest.readFromUploadChannel callback.

components/cronet/android/org_chromium_net_UrlRequest.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 "components/cronet/android/org_chromium_net_UrlRequest.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
 #include "components/cronet/android/url_request_context_peer.h"
@@ skipping 52 matching lines @@
 
   virtual void OnResponseStarted(URLRequestPeer* request) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_UrlRequest_onResponseStarted(env, owner_);
   }
 
   virtual void OnBytesRead(URLRequestPeer* request) OVERRIDE {
     int bytes_read = request->bytes_read();
     if (bytes_read != 0) {
       JNIEnv* env = base::android::AttachCurrentThread();
-      jobject bytebuf = env->NewDirectByteBuffer(request->Data(), bytes_read);
-      cronet::Java_UrlRequest_onBytesRead(env, owner_, bytebuf);
-      env->DeleteLocalRef(bytebuf);
+      jobject java_buffer =
+          env->NewDirectByteBuffer(request->Data(), bytes_read);
+      cronet::Java_UrlRequest_onBytesRead(env, owner_, java_buffer);
+      env->DeleteLocalRef(java_buffer);
     }
   }
 
   virtual void OnRequestFinished(URLRequestPeer* request) OVERRIDE {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_UrlRequest_finish(env, owner_);
   }
 
+  virtual int ReadFromUploadChannel(net::IOBuffer* buf,
+                                    int buf_length) OVERRIDE {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    jobject jbuf = env->NewDirectByteBuffer(

[mmenke, 2014/08/05 21:08:02]

You renamed the wrong one, though I agree with that rename as well.

[mef, 2014/08/05 21:38:45]

Done.

+        reinterpret_cast<void*>(buf->data()), buf_length);
+    jint bytes_read =
+        cronet::Java_UrlRequest_readFromUploadChannel(env, owner_, jbuf);
+    env->DeleteLocalRef(jbuf);
+    return bytes_read;
+  }
+
  protected:
   virtual ~JniURLRequestPeerDelegate() {
     JNIEnv* env = base::android::AttachCurrentThread();
     env->DeleteGlobalRef(owner_);
   }
 
  private:
   jobject owner_;
 
   DISALLOW_COPY_AND_ASSIGN(JniURLRequestPeerDelegate);
@@ skipping 75 matching lines @@
                                 size);
       env->ReleaseByteArrayElements(content, content_bytes, 0);
     }
   }
 }
 
 static void SetUploadChannel(JNIEnv* env,
                              jobject object,
                              jlong urlRequestPeer,
                              jstring content_type,
-                             jobject content,
                              jlong content_length) {
   URLRequestPeer* request = reinterpret_cast<URLRequestPeer*>(urlRequestPeer);
   SetPostContentType(env, request, content_type);
 
-  request->SetUploadChannel(env, content, content_length);
+  request->SetUploadChannel(env, content_length);
 }
 
 
 /* synchronized */
 static void Start(JNIEnv* env, jobject object, jlong urlRequestPeer) {
   URLRequestPeer* request = reinterpret_cast<URLRequestPeer*>(urlRequestPeer);
   if (request != NULL) {
     request->Start();
   }
 }
@@ skipping 139 matching lines @@
 
   // Some implementations (notably HttpURLConnection) include a mapping for the
   // null key; in HTTP's case, this maps to the HTTP status line.
   ScopedJavaLocalRef<jstring> status_line =
       ConvertUTF8ToJavaString(env, headers->GetStatusLine());
   Java_UrlRequest_onAppendResponseHeader(
       env, object, headersMap, NULL, status_line.Release());
 }
 
 }  // namespace cronet