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

components/cronet/android/org_chromium_net_UrlRequest.cc

Index: components/cronet/android/org_chromium_net_UrlRequest.cc
diff --git a/components/cronet/android/org_chromium_net_UrlRequest.cc b/components/cronet/android/org_chromium_net_UrlRequest.cc
index 7d3cf6ba6eb970854d055a023df74c5547295564..0d95c5b6962900a0f39258ff4dbee84209fc927e 100644
--- a/components/cronet/android/org_chromium_net_UrlRequest.cc
+++ b/components/cronet/android/org_chromium_net_UrlRequest.cc
@@ -301,4 +301,23 @@ static jlong GetContentLength(JNIEnv* env,
   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