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

chrome/browser/android/tab_state.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 "chrome/browser/android/tab_state.h"
 
 #include <jni.h>
 #include <limits>
 #include <vector>
 
@@ skipping 424 matching lines @@
   WebContents::CreateParams params(profile);
   params.initially_hidden = initially_hidden;
   scoped_ptr<WebContents> web_contents(WebContents::Create(params));
   web_contents->GetController().Restore(
       current_entry_index,
       NavigationController::RESTORE_CURRENT_SESSION,
       &scoped_entries);
   return web_contents.release();
 }
 
-ScopedJavaLocalRef<jobject> WebContentsState::RestoreContentsFromByteBuffer(
+jobject WebContentsState::RestoreContentsFromByteBuffer(
     JNIEnv* env,
     jclass clazz,
     jobject state,
     jint saved_state_version,
     jboolean initially_hidden) {
   void* data = env->GetDirectBufferAddress(state);
   int size = env->GetDirectBufferCapacity(state);
 
   WebContents* web_contents = WebContentsState::RestoreContentsFromByteBuffer(
       data,
       size,
       saved_state_version,
       initially_hidden);
 
-  if (web_contents)
-    return web_contents->GetJavaWebContents();
-  else
-    return ScopedJavaLocalRef<jobject>();
+  return web_contents ? web_contents->GetJavaWebContents().Release() : nullptr;
 }
 
 ScopedJavaLocalRef<jobject>
     WebContentsState::CreateSingleNavigationStateAsByteBuffer(
         JNIEnv* env,
         jstring url,
         jstring referrer_url,
         jint referrer_policy,
         jboolean is_off_the_record) {
   content::Referrer referrer;
@@ skipping 20 matching lines @@
                                                         0);
 }
 
 // Static JNI methods.
 
 static void FreeWebContentsStateBuffer(JNIEnv* env, jclass clazz, jobject obj) {
   void* data = env->GetDirectBufferAddress(obj);
   free(data);
 }
 
-static ScopedJavaLocalRef<jobject> RestoreContentsFromByteBuffer(
-    JNIEnv* env,
-    jclass clazz,
-    jobject state,
-    jint saved_state_version,
-    jboolean initially_hidden) {
+static jobject RestoreContentsFromByteBuffer(JNIEnv* env,
+                                             jclass clazz,
+                                             jobject state,
+                                             jint saved_state_version,
+                                             jboolean initially_hidden) {
   return WebContentsState::RestoreContentsFromByteBuffer(env,
                                                          clazz,
                                                          state,
                                                          saved_state_version,
                                                          initially_hidden);
 }
 
-static ScopedJavaLocalRef<jobject> GetContentsStateAsByteBuffer(JNIEnv* env,
-                                                                jclass clazz,
-                                                                jobject jtab) {
+static jobject GetContentsStateAsByteBuffer(
+    JNIEnv* env, jclass clazz, jobject jtab) {
   TabAndroid* tab_android = TabAndroid::GetNativeTab(env, jtab);
-  return WebContentsState::GetContentsStateAsByteBuffer(env, tab_android);
+  return WebContentsState::GetContentsStateAsByteBuffer(
+      env, tab_android).Release();
 }
 
-static ScopedJavaLocalRef<jobject> CreateSingleNavigationStateAsByteBuffer(
+static jobject CreateSingleNavigationStateAsByteBuffer(
     JNIEnv* env,
     jclass clazz,
     jstring url,
     jstring referrer_url,
     jint referrer_policy,
     jboolean is_off_the_record) {
   return WebContentsState::CreateSingleNavigationStateAsByteBuffer(
-      env, url, referrer_url, referrer_policy, is_off_the_record);
+      env, url, referrer_url, referrer_policy, is_off_the_record).Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetDisplayTitleFromByteBuffer(
-    JNIEnv* env,
-    jclass clazz,
-    jobject state,
-    jint saved_state_version) {
+static jstring GetDisplayTitleFromByteBuffer(JNIEnv* env,
+                                             jclass clazz,
+                                             jobject state,
+                                             jint saved_state_version) {
   void* data = env->GetDirectBufferAddress(state);
   int size = env->GetDirectBufferCapacity(state);
 
   ScopedJavaLocalRef<jstring> result =
       WebContentsState::GetDisplayTitleFromByteBuffer(
           env, data, size, saved_state_version);
-  return result;
+  return result.Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetVirtualUrlFromByteBuffer(
-    JNIEnv* env,
-    jclass clazz,
-    jobject state,
-    jint saved_state_version) {
+static jstring GetVirtualUrlFromByteBuffer(JNIEnv* env,
+                                           jclass clazz,
+                                           jobject state,
+                                           jint saved_state_version) {
   void* data = env->GetDirectBufferAddress(state);
   int size = env->GetDirectBufferCapacity(state);
   ScopedJavaLocalRef<jstring> result =
       WebContentsState::GetVirtualUrlFromByteBuffer(
           env, data, size, saved_state_version);
-  return result;
+  return result.Release();
 }
 
 // Creates a historical tab entry from the serialized tab contents contained
 // within |state|.
 static void CreateHistoricalTab(JNIEnv* env,
                                 jclass clazz,
                                 jobject state,
                                 jint saved_state_version) {
-  scoped_ptr<WebContents> web_contents(WebContents::FromJavaWebContents(
-      WebContentsState::RestoreContentsFromByteBuffer(env, clazz, state,
-                                                      saved_state_version, true)
-          .obj()));
+  scoped_ptr<WebContents> web_contents(
+      WebContents::FromJavaWebContents(
+          WebContentsState::RestoreContentsFromByteBuffer(env,
+                                                          clazz,
+                                                          state,
+                                                          saved_state_version,
+                                                          true)));
   if (web_contents.get())
     TabAndroid::CreateHistoricalTabFromContents(web_contents.get());
 }
 
 bool RegisterTabState(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }