Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

chrome/browser/ui/android/connection_info_popup_android.cc

 // Copyright 2015 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 "chrome/browser/ui/android/connection_info_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 12 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::CheckException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::GetClass;
 using base::android::ScopedJavaLocalRef;
 using content::CertStore;
 using content::WebContents;
 
-static ScopedJavaLocalRef<jobjectArray>
-GetCertificateChain(JNIEnv* env, jobject obj, jobject java_web_contents) {
+static jobjectArray GetCertificateChain(JNIEnv* env,
+                                        jobject obj,
+                                        jobject java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   if (!web_contents)
-    return ScopedJavaLocalRef<jobjectArray>();
+    return NULL;
 
   int cert_id =
       web_contents->GetController().GetVisibleEntry()->GetSSL().cert_id;
   scoped_refptr<net::X509Certificate> cert;
   bool ok = CertStore::GetInstance()->RetrieveCert(cert_id, &cert);
   CHECK(ok);
 
   std::vector<std::string> cert_chain;
   net::X509Certificate::OSCertHandles cert_handles =
       cert->GetIntermediateCertificates();
   // Make sure the peer's own cert is the first in the chain, if it's not
   // already there.
   if (cert_handles.empty() || cert_handles[0] != cert->os_cert_handle())
     cert_handles.insert(cert_handles.begin(), cert->os_cert_handle());
 
   cert_chain.reserve(cert_handles.size());
   for (net::X509Certificate::OSCertHandles::const_iterator it =
            cert_handles.begin();
        it != cert_handles.end();
        ++it) {
     std::string cert_bytes;
     net::X509Certificate::GetDEREncoded(*it, &cert_bytes);
     cert_chain.push_back(cert_bytes);
   }
 
-  return base::android::ToJavaArrayOfByteArray(env, cert_chain);
+  // OK to release, JNI binding.
+  return base::android::ToJavaArrayOfByteArray(env, cert_chain).Release();
 }
 
 // static
 static jlong Init(JNIEnv* env,
                   jclass clazz,
                   jobject obj,
                   jobject java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
 
@@ skipping 111 matching lines @@
   // There's no tab UI on Android - only connection info is shown.
   NOTIMPLEMENTED();
 }
 
 // static
 bool
 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }