Merge 271992 "Upstream changes to:"

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 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