Revert 290810 "Make class lookup lazy in jni_generator when usin..."

trunk/src/base/android/jni_generator/testInnerClassNativesMultiple.golden

Index: trunk/src/base/android/jni_generator/testInnerClassNativesMultiple.golden
===================================================================
--- trunk/src/base/android/jni_generator/testInnerClassNativesMultiple.golden	(revision 290812)
+++ trunk/src/base/android/jni_generator/testInnerClassNativesMultiple.golden	(working copy)
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -22,16 +22,8 @@
     "org/chromium/TestJni$MyOtherInnerClass";
 const char kTestJniClassPath[] = "org/chromium/TestJni";
 const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass";
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
 
 }  // namespace
 
@@ -64,21 +56,21 @@
   const int kMethodsMyOtherInnerClassSize =
       arraysize(kMethodsMyOtherInnerClass);
 
-  if (env->RegisterNatives(MyOtherInnerClass_clazz(env),
+  if (env->RegisterNatives(g_MyOtherInnerClass_clazz,
                            kMethodsMyOtherInnerClass,
                            kMethodsMyOtherInnerClassSize) < 0) {
     jni_generator::HandleRegistrationError(
-        env, MyOtherInnerClass_clazz(env), __FILE__);
+        env, g_MyOtherInnerClass_clazz, __FILE__);
     return false;
   }
 
   const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass);
 
-  if (env->RegisterNatives(MyInnerClass_clazz(env),
+  if (env->RegisterNatives(g_MyInnerClass_clazz,
                            kMethodsMyInnerClass,
                            kMethodsMyInnerClassSize) < 0) {
     jni_generator::HandleRegistrationError(
-        env, MyInnerClass_clazz(env), __FILE__);
+        env, g_MyInnerClass_clazz, __FILE__);
     return false;
   }