Stop relying on using statements in the JNI generator.

base/android/jni_generator/testMultipleJNIAdditionalImport.golden

 // 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/foo/Foo
 
 #ifndef org_chromium_foo_Foo_JNI
 #define org_chromium_foo_Foo_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_generator/jni_generator_helper.h"
 
 #include "base/android/jni_int_wrapper.h"
 
 // Step 1: forward declarations.
 namespace {
 const char kFooClassPath[] = "org/chromium/foo/Foo";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 base::subtle::AtomicWord g_Foo_clazz __attribute__((unused)) = 0;
 #define Foo_clazz(env) base::android::LazyGetClass(env, kFooClassPath, &g_Foo_clazz)
 
 }  // namespace
 
 // Step 2: method stubs.
 
-static void DoSomething(JNIEnv* env, const JavaParamRef<jclass>& jcaller,
-    const JavaParamRef<jobject>& callback1,
-    const JavaParamRef<jobject>& callback2);
+static void DoSomething(JNIEnv* env, const base::android::JavaParamRef<jclass>&
+    jcaller,
+    const base::android::JavaParamRef<jobject>& callback1,
+    const base::android::JavaParamRef<jobject>& callback2);
 
 extern "C" __attribute__((visibility("default")))
 void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller,
     jobject callback1,
     jobject callback2) {
-  return DoSomething(env, JavaParamRef<jclass>(env, jcaller),
-      JavaParamRef<jobject>(env, callback1), JavaParamRef<jobject>(env,
-      callback2));
+  return DoSomething(env, base::android::JavaParamRef<jclass>(env, jcaller),
+      base::android::JavaParamRef<jobject>(env, callback1),
+      base::android::JavaParamRef<jobject>(env, callback2));
 }
 
 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
 static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
     jobject callback2) {
   CHECK_CLAZZ(env, Foo_clazz(env),
       Foo_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
@@ skipping 34 matching lines @@
                            kMethodsFooSize) < 0) {
     jni_generator::HandleRegistrationError(
         env, Foo_clazz(env), __FILE__);
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_foo_Foo_JNI