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

chrome/browser/signin/oauth2_token_service_delegate_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_DELEGATE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
 
 #include "base/android/jni_weak_ref.h"
-#include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service_delegate.h"
 
 // A specialization of OAuth2TokenServiceDelegate that will be returned by
 // OAuth2TokenServiceDelegateFactory for OS_ANDROID.  This instance uses
 // native Android features to lookup OAuth2 tokens.
 //
 // See |OAuth2TokenServiceDelegate| for usage details.
 //
 // Note: requests should be started from the UI thread. To start a
 // request from other thread, please use OAuth2TokenServiceRequest.
 class OAuth2TokenServiceDelegateAndroid : public OAuth2TokenServiceDelegate {
  public:
   // Registers the OAuth2TokenServiceDelegateAndroid's native methods through
   // JNI.
   static bool Register(JNIEnv* env);
 
   // Creates a new instance of the OAuth2TokenServiceDelegateAndroid.
   static OAuth2TokenServiceDelegateAndroid* Create();
 
   // Returns a reference to the Java instance of this service.
-  static base::android::ScopedJavaLocalRef<jobject>
-  GetForProfile(JNIEnv* env, jclass clazz, jobject j_profile_android);
+  static jobject GetForProfile(JNIEnv* env,
+                               jclass clazz,
+                               jobject j_profile_android);
 
   // Called by the TestingProfile class to disable account validation in
   // tests.  This prevents the token service from trying to look up system
   // accounts which requires special permission.
   static void set_is_testing_profile() { is_testing_profile_ = true; }
 
   void Initialize();
 
   // OAuth2TokenServiceDelegate overrides:
   bool RefreshTokenIsAvailable(const std::string& account_id) const override;
@@ skipping 82 matching lines @@
 
   // Maps account_id to the last error for that account.
   std::map<std::string, ErrorInfo> errors_;
 
   static bool is_testing_profile_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceDelegateAndroid);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_DELEGATE_ANDROID_H_