| Index: base/android/jni_generator/testFromJavaP.golden
|
| diff --git a/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden
|
| index 18e10820b5cf1bffa22e2b5e319b0d3b84559130..9b7ba654218d11ec13f408217ec69d7e3b2dde31 100644
|
| --- a/base/android/jni_generator/testFromJavaP.golden
|
| +++ b/base/android/jni_generator/testFromJavaP.golden
|
| @@ -221,9 +221,10 @@ static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) {
|
| }
|
|
|
| static base::subtle::AtomicWord g_InputStream_Constructor = 0;
|
| -static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env)
|
| - __attribute__ ((unused));
|
| -static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env) {
|
| +static base::android::ScopedJavaLocalRef<jobject>
|
| + Java_InputStream_Constructor(JNIEnv* env) __attribute__ ((unused));
|
| +static base::android::ScopedJavaLocalRef<jobject>
|
| + Java_InputStream_Constructor(JNIEnv* env) {
|
| CHECK_CLAZZ(env, InputStream_clazz(env),
|
| InputStream_clazz(env), NULL);
|
| jmethodID method_id =
|
| @@ -238,7 +239,7 @@ static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env) {
|
| env->NewObject(InputStream_clazz(env),
|
| method_id);
|
| jni_generator::CheckException(env);
|
| - return ScopedJavaLocalRef<jobject>(env, ret);
|
| + return base::android::ScopedJavaLocalRef<jobject>(env, ret);
|
| }
|
|
|
| // Step 3: RegisterNatives.
|
|
|