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

android/jni_generator/golden_sample_for_tests_jni.h

Index: android/jni_generator/golden_sample_for_tests_jni.h
diff --git a/android/jni_generator/golden_sample_for_tests_jni.h b/android/jni_generator/golden_sample_for_tests_jni.h
index fefb59bae6d5309f16328569219f0a7803a6d1d7..8979697b8764f0e815343fa3e3940e6c6343d6fa 100644
--- a/android/jni_generator/golden_sample_for_tests_jni.h
+++ b/android/jni_generator/golden_sample_for_tests_jni.h
@@ -90,13 +90,14 @@ Java_org_chromium_example_jni_1generator_SampleForTests_nativeSetNonPODDatatype(
   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
@@ -247,10 +248,10 @@ static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, jobject
 }
 
 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);
@@ -272,7 +273,7 @@ static base::android::ScopedJavaLocalRef<jobject>
       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;
@@ -346,8 +347,8 @@ static jlong Java_InnerStructB_getKey(JNIEnv* env, jobject obj) {
 }
 
 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);
@@ -366,7 +367,7 @@ static base::android::ScopedJavaLocalRef<jstring>
       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.