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

chrome/browser/signin/oauth2_token_service_delegate_android.cc

 // Copyright 2013 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/signin/oauth2_token_service_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 132 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> local_java_ref =
       Java_OAuth2TokenService_create(env, reinterpret_cast<intptr_t>(this));
   java_ref_.Reset(env, local_java_ref.obj());
 }
 
 OAuth2TokenServiceDelegateAndroid::~OAuth2TokenServiceDelegateAndroid() {
 }
 
 // static
-ScopedJavaLocalRef<jobject> OAuth2TokenServiceDelegateAndroid::GetForProfile(
+jobject OAuth2TokenServiceDelegateAndroid::GetForProfile(
     JNIEnv* env,
     jclass clazz,
     jobject j_profile_android) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile_android);
   ProfileOAuth2TokenService* service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   OAuth2TokenServiceDelegate* delegate = service->GetDelegate();
-  return ScopedJavaLocalRef<jobject>(
-      static_cast<OAuth2TokenServiceDelegateAndroid*>(delegate)->java_ref_);
+  return static_cast<OAuth2TokenServiceDelegateAndroid*>(delegate)
+      ->java_ref_.obj();
 }
 
-static ScopedJavaLocalRef<jobject> GetForProfile(JNIEnv* env,
-                                                 jclass clazz,
-                                                 jobject j_profile_android) {
+static jobject GetForProfile(JNIEnv* env,
+                             jclass clazz,
+                             jobject j_profile_android) {
   return OAuth2TokenServiceDelegateAndroid::GetForProfile(env, clazz,
                                                           j_profile_android);
 }
 
 void OAuth2TokenServiceDelegateAndroid::Initialize() {
   DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::Initialize";
   if (!is_testing_profile_) {
     Java_OAuth2TokenService_validateAccounts(
         AttachCurrentThread(), java_ref_.obj(),
         base::android::GetApplicationContext(), JNI_TRUE);
@@ skipping 289 matching lines @@
   GoogleServiceAuthError err(authToken
                                  ? GoogleServiceAuthError::NONE
                                  : GoogleServiceAuthError::CONNECTION_FAILED);
   heap_callback->Run(err, token, base::Time());
 }
 
 // static
 bool OAuth2TokenServiceDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }