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

android/jni_generator/testNativeExportsOptionalOption.golden

Index: android/jni_generator/testNativeExportsOptionalOption.golden
diff --git a/android/jni_generator/testNativeExportsOptionalOption.golden b/android/jni_generator/testNativeExportsOptionalOption.golden
index 2bb7721122a4b9d0652a206d108a1249f8b61dc7..6e2b655e2187ed9ba8a2a41786deddbe6caa8268 100644
--- a/android/jni_generator/testNativeExportsOptionalOption.golden
+++ b/android/jni_generator/testNativeExportsOptionalOption.golden
@@ -95,7 +95,7 @@ static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,
 
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithParamAndReturn =
     0;
-static base::android::ScopedJavaLocalRef<jstring>
+static ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, jobject obj,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
@@ -117,7 +117,7 @@ static base::android::ScopedJavaLocalRef<jstring>
       static_cast<jstring>(env->CallObjectMethod(obj,
           method_id, as_jint(iParam)));
   jni_generator::CheckException(env);
-  return base::android::ScopedJavaLocalRef<jstring>(env, ret);
+  return ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithParam = 0;
@@ -170,7 +170,7 @@ static jdouble Java_SampleForTests_testMethodWithNoParam(JNIEnv* env) {
 
 static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithNoParam =
     0;
-static base::android::ScopedJavaLocalRef<jstring>
+static ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testStaticMethodWithNoParam(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, SampleForTests_clazz(env),
@@ -190,7 +190,7 @@ static base::android::ScopedJavaLocalRef<jstring>
 static_cast<jstring>(env->CallStaticObjectMethod(SampleForTests_clazz(env),
           method_id));
   jni_generator::CheckException(env);
-  return base::android::ScopedJavaLocalRef<jstring>(env, ret);
+  return ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 // Step 3: RegisterNatives.