Upstream changes to HttpUrlRequest for querying response headers and closing ReadableByteChannel.

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 283 matching lines @@
 static jlong GetContentLength(JNIEnv* env,
                               jobject object,
                               jlong urlRequestPeer) {
   URLRequestPeer* request = reinterpret_cast<URLRequestPeer*>(urlRequestPeer);
   if (request == NULL) {
     return 0;
   }
   return request->content_length();
 }
 
+static jstring GetHeader(
+    JNIEnv* env, jobject object, jlong urlRequestPeer, jstring name) {
+  URLRequestPeer* request = reinterpret_cast<URLRequestPeer*>(urlRequestPeer);
+  if (request == NULL) {
+    return 0;
+  }
+  if (request == NULL) {

[mmenke, 2014/05/09 16:41:40]

I don't think we need two of these.  Probably best to keep the return NULL,
rather than 0.  Or better yet, can we just return "jstring()", both here and
below?  Or should it be jstring(NULL)?

[mef, 2014/05/09 18:49:16]

Good catch, we don't.
The jstring is actually a pointer: typedef _jstring *jstring;

Returning NULL seems consistent with GetContentType, but I'm open to adding
static_cast.

+    return NULL;
+  }
+
+  std::string name_string = base::android::ConvertJavaStringToUTF8(env, name);
+  std::string value = request->GetHeader(name_string);
+  if (!value.empty()) {
+    return ConvertUTF8ToJavaString(env, value.c_str()).Release();
+  } else {
+    return NULL;
+  }
+}
+
 }  // namespace cronet