Stop relying on using statements in the JNI generator.

base/android/jni_generator/testNativeExportsOnlyOption.golden

Index: base/android/jni_generator/testNativeExportsOnlyOption.golden
diff --git a/base/android/jni_generator/testNativeExportsOnlyOption.golden b/base/android/jni_generator/testNativeExportsOnlyOption.golden
index 97ef05705566db665744be24096faa028dc868f9..a024f875a148f2c097b725967d324a609cf51707 100644
--- a/base/android/jni_generator/testNativeExportsOnlyOption.golden
+++ b/base/android/jni_generator/testNativeExportsOnlyOption.golden
@@ -36,7 +36,8 @@ jint
     jint arg1) {
   Test* native = reinterpret_cast<Test*>(nativeTest);
   CHECK_NATIVE_PTR(env, jcaller, native, "StaticMethod", 0);
-  return native->StaticMethod(env, JavaParamRef<jobject>(env, jcaller), arg1);
+  return native->StaticMethod(env, base::android::JavaParamRef<jobject>(env,
+      jcaller), arg1);
 }
 
 extern "C" __attribute__((visibility("default")))
@@ -48,25 +49,28 @@ jint
     jint arg1) {
   Test* native = reinterpret_cast<Test*>(nativeTest);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
-  return native->Method(env, JavaParamRef<jobject>(env, jcaller), arg1);
+  return native->Method(env, base::android::JavaParamRef<jobject>(env, jcaller),
+      arg1);
 }
 
-static jint Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller);
+static jint Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
+    jcaller);
 
 extern "C" __attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyInnerClass_nativeInit(JNIEnv*
     env, jobject jcaller) {
-  return Init(env, JavaParamRef<jobject>(env, jcaller));
+  return Init(env, base::android::JavaParamRef<jobject>(env, jcaller));
 }
 
-static jint Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller);
+static jint Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
+    jcaller);
 
 extern "C" __attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyOtherInnerClass_nativeInit(JNIEnv*
     env, jobject jcaller) {
-  return Init(env, JavaParamRef<jobject>(env, jcaller));
+  return Init(env, base::android::JavaParamRef<jobject>(env, jcaller));
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithParam = 0;
@@ -94,7 +98,7 @@ static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,
 
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithParamAndReturn =
     0;
-static ScopedJavaLocalRef<jstring>
+static base::android::ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, jobject obj,
     JniIntWrapper iParam) {
   CHECK_CLAZZ(env, obj,
@@ -115,7 +119,7 @@ static ScopedJavaLocalRef<jstring>
       static_cast<jstring>(env->CallObjectMethod(obj,
           method_id, as_jint(iParam)));
   jni_generator::CheckException(env);
-  return ScopedJavaLocalRef<jstring>(env, ret);
+  return base::android::ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithParam = 0;
@@ -166,7 +170,7 @@ static jdouble Java_SampleForTests_testMethodWithNoParam(JNIEnv* env) {
 
 static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithNoParam =
     0;
-static ScopedJavaLocalRef<jstring>
+static base::android::ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testStaticMethodWithNoParam(JNIEnv* env) {
   CHECK_CLAZZ(env, SampleForTests_clazz(env),
       SampleForTests_clazz(env), NULL);
@@ -185,7 +189,7 @@ static ScopedJavaLocalRef<jstring>
 static_cast<jstring>(env->CallStaticObjectMethod(SampleForTests_clazz(env),
           method_id));
   jni_generator::CheckException(env);
-  return ScopedJavaLocalRef<jstring>(env, ret);
+  return base::android::ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 // Step 3: RegisterNatives.