Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

android/jni_generator/golden_sample_for_tests_jni.h

 // 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.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/example/jni_generator/SampleForTests
 
 #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
@@ skipping 72 matching lines @@
     jobject rect);
 
 static void
 Java_org_chromium_example_jni_1generator_SampleForTests_nativeSetNonPODDatatype(
     JNIEnv* env,
     jobject jcaller,
     jobject rect) {
   return SetNonPODDatatype(env, jcaller, rect);
 }
 
-static jobject GetNonPODDatatype(JNIEnv* env, jobject jcaller);
+static ScopedJavaLocalRef<jobject> GetNonPODDatatype(JNIEnv* env,
+                                                     jobject jcaller);
 
 static jobject
 Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetNonPODDatatype(
     JNIEnv* env,
     jobject jcaller) {
-  return GetNonPODDatatype(env, jcaller);
+  return GetNonPODDatatype(env, jcaller).Release();
 }
 
 static jint
 Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethod(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
   return native->Method(env, jcaller);
@@ skipping 130 matching lines @@
 ")"
 "V",
       &g_SampleForTests_methodThatThrowsException);
 
      env->CallVoidMethod(obj,
           method_id);
 
 }
 
 static base::subtle::AtomicWord g_InnerStructA_create = 0;
-static base::android::ScopedJavaLocalRef<jobject>
-    Java_InnerStructA_create(JNIEnv* env, jlong l,
-    JniIntWrapper i,
-    jstring s) {
+static ScopedJavaLocalRef<jobject> Java_InnerStructA_create(JNIEnv* env,
+                                                            jlong l,
+                                                            JniIntWrapper i,
+                                                            jstring s) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, InnerStructA_clazz(env),
       InnerStructA_clazz(env), NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, InnerStructA_clazz(env),
       "create",
 
 "("
 "J"
 "I"
 "Ljava/lang/String;"
 ")"
 "Lorg/chromium/example/jni_generator/SampleForTests$InnerStructA;",
       &g_InnerStructA_create);
 
   jobject ret =
       env->CallStaticObjectMethod(InnerStructA_clazz(env),
           method_id, l, as_jint(i), s);
   jni_generator::CheckException(env);
-  return base::android::ScopedJavaLocalRef<jobject>(env, ret);
+  return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_addStructA = 0;
 static void Java_SampleForTests_addStructA(JNIEnv* env, jobject obj, jobject a)
     {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
       SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
@@ skipping 53 matching lines @@
       &g_InnerStructB_getKey);
 
   jlong ret =
       env->CallLongMethod(obj,
           method_id);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InnerStructB_getValue = 0;
-static base::android::ScopedJavaLocalRef<jstring>
-    Java_InnerStructB_getValue(JNIEnv* env, jobject obj) {
+static ScopedJavaLocalRef<jstring> Java_InnerStructB_getValue(JNIEnv* env,
+                                                              jobject obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
       InnerStructB_clazz(env), NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, InnerStructB_clazz(env),
       "getValue",
 
 "("
 ")"
 "Ljava/lang/String;",
       &g_InnerStructB_getValue);
 
   jstring ret =
       static_cast<jstring>(env->CallObjectMethod(obj,
           method_id));
   jni_generator::CheckException(env);
-  return base::android::ScopedJavaLocalRef<jstring>(env, ret);
+  return ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsSampleForTests[] = {
     {"nativeInit",
      "("
      "Ljava/lang/String;"
      ")"
      "J",
@@ skipping 88 matching lines @@
     return false;
   }
 
   return true;
 }
 
 }  // namespace android
 }  // namespace base
 
 #endif  // org_chromium_example_jni_generator_SampleForTests_JNI