Index: chrome/browser/ui/android/connection_info_popup_android.cc |
diff --git a/chrome/browser/ui/android/connection_info_popup_android.cc b/chrome/browser/ui/android/connection_info_popup_android.cc |
index 3b7878e56249ce09685238752ce68b0bd68cce36..4be9e37327610745ab82de0cc4bf0fcf702017b6 100644 |
--- a/chrome/browser/ui/android/connection_info_popup_android.cc |
+++ b/chrome/browser/ui/android/connection_info_popup_android.cc |
@@ -30,13 +30,12 @@ using base::android::ScopedJavaLocalRef; |
using content::CertStore; |
using content::WebContents; |
-static jobjectArray GetCertificateChain(JNIEnv* env, |
- jobject obj, |
- jobject java_web_contents) { |
+static ScopedJavaLocalRef<jobjectArray> |
+GetCertificateChain(JNIEnv* env, jobject obj, jobject java_web_contents) { |
content::WebContents* web_contents = |
content::WebContents::FromJavaWebContents(java_web_contents); |
if (!web_contents) |
- return NULL; |
+ return ScopedJavaLocalRef<jobjectArray>(); |
int cert_id = |
web_contents->GetController().GetVisibleEntry()->GetSSL().cert_id; |
@@ -62,8 +61,7 @@ static jobjectArray GetCertificateChain(JNIEnv* env, |
cert_chain.push_back(cert_bytes); |
} |
- // OK to release, JNI binding. |
- return base::android::ToJavaArrayOfByteArray(env, cert_chain).Release(); |
+ return base::android::ToJavaArrayOfByteArray(env, cert_chain); |
} |
// static |