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

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

Index: trunk/src/base/android/jni_generator/testJarJarRemapping.golden
===================================================================
--- trunk/src/base/android/jni_generator/testJarJarRemapping.golden	(revision 290812)
+++ trunk/src/base/android/jni_generator/testJarJarRemapping.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.
 
@@ -19,16 +19,8 @@
 // Step 1: forward declarations.
 namespace {
 const char kExampleClassPath[] = "com/test/jni_generator/Example";
-#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_Example_clazz = NULL;
-jclass Example_clazz(JNIEnv*) { return g_Example_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
 
 }  // namespace
 
@@ -77,11 +69,11 @@
 
   const int kMethodsExampleSize = arraysize(kMethodsExample);
 
-  if (env->RegisterNatives(Example_clazz(env),
+  if (env->RegisterNatives(g_Example_clazz,
                            kMethodsExample,
                            kMethodsExampleSize) < 0) {
     jni_generator::HandleRegistrationError(
-        env, Example_clazz(env), __FILE__);
+        env, g_Example_clazz, __FILE__);
     return false;
   }