Android: sync up latest JNI generator changes from downstream.

base/android/jni_generator/testFromJavaP.golden

-// Copyright 2013 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.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     java/io/InputStream
 
 #ifndef java_io_InputStream_JNI
 #define java_io_InputStream_JNI
 
 #include <jni.h>
 
-#include "base/android/jni_android.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
-#include "base/logging.h"
-
-using base::android::ScopedJavaLocalRef;
+#include "base/android/jni_generator/jni_generator_helper.h"
 
 // Step 1: forward declarations.
 namespace {
 const char kInputStreamClassPath[] = "java/io/InputStream";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_InputStream_clazz = NULL;
+
 }  // namespace
 
 namespace JNI_InputStream {
 
 // Step 2: method stubs.
 
 static base::subtle::AtomicWord g_InputStream_available = 0;
 static jint Java_InputStream_available(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static jint Java_InputStream_available(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "available",
       "()I",
       &g_InputStream_available);
 
   jint ret =
-    env->CallIntMethod(obj,
-      method_id);
-  base::android::CheckException(env);
+      env->CallIntMethod(obj,
+          method_id);
+  jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_close = 0;
 static void Java_InputStream_close(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static void Java_InputStream_close(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "close",
       "()V",
       &g_InputStream_close);
 
-  env->CallVoidMethod(obj,
-      method_id);
-  base::android::CheckException(env);
+     env->CallVoidMethod(obj,
+          method_id);
+  jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_mark = 0;
 static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0)
     __attribute__ ((unused));
 static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "mark",
       "(I)V",
       &g_InputStream_mark);
 
-  env->CallVoidMethod(obj,
-      method_id, p0);
-  base::android::CheckException(env);
+     env->CallVoidMethod(obj,
+          method_id, p0);
+  jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_markSupported = 0;
 static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj)
     __attribute__ ((unused));
 static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, false);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "markSupported",
       "()Z",
       &g_InputStream_markSupported);
 
   jboolean ret =
-    env->CallBooleanMethod(obj,
-      method_id);
-  base::android::CheckException(env);
+      env->CallBooleanMethod(obj,
+          method_id);
+  jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI = 0;
 static jint Java_InputStream_readI(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static jint Java_InputStream_readI(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
       "()I",
       &g_InputStream_readI);
 
   jint ret =
-    env->CallIntMethod(obj,
-      method_id);
-  base::android::CheckException(env);
+      env->CallIntMethod(obj,
+          method_id);
+  jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI_AB = 0;
 static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0)
     __attribute__ ((unused));
 static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
       "([B)I",
       &g_InputStream_readI_AB);
 
   jint ret =
-    env->CallIntMethod(obj,
-      method_id, p0);
-  base::android::CheckException(env);
+      env->CallIntMethod(obj,
+          method_id, p0);
+  jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI_AB_I_I = 0;
 static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
     p0,
     jint p1,
     jint p2) __attribute__ ((unused));
 static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
     p0,
     jint p1,
     jint p2) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
       "([BII)I",
       &g_InputStream_readI_AB_I_I);
 
   jint ret =
-    env->CallIntMethod(obj,
-      method_id, p0, p1, p2);
-  base::android::CheckException(env);
+      env->CallIntMethod(obj,
+          method_id, p0, p1, p2);
+  jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_reset = 0;
 static void Java_InputStream_reset(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static void Java_InputStream_reset(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "reset",
       "()V",
       &g_InputStream_reset);
 
-  env->CallVoidMethod(obj,
-      method_id);
-  base::android::CheckException(env);
+     env->CallVoidMethod(obj,
+          method_id);
+  jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_skip = 0;
 static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0)
     __attribute__ ((unused));
 static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "skip",
       "(J)J",
       &g_InputStream_skip);
 
   jlong ret =
-    env->CallLongMethod(obj,
-      method_id, p0);
-  base::android::CheckException(env);
+      env->CallLongMethod(obj,
+          method_id, p0);
+  jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_Constructor = 0;
-static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env)
-    __attribute__ ((unused));
-static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env) {
+static base::android::ScopedJavaLocalRef<jobject>
+    Java_InputStream_Constructor(JNIEnv* env) __attribute__ ((unused));
+static base::android::ScopedJavaLocalRef<jobject>
+    Java_InputStream_Constructor(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(g_InputStream_clazz);
+  DCHECK_CLAZZ(g_InputStream_clazz, NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "<init>",
       "()V",
       &g_InputStream_Constructor);
 
   jobject ret =
-    env->NewObject(g_InputStream_clazz,
-      method_id);
-  base::android::CheckException(env);
-  return ScopedJavaLocalRef<jobject>(env, ret);
+      env->NewObject(g_InputStream_clazz,
+          method_id);
+  jni_generator::CheckException(env);
+  return base::android::ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 // Step 3: RegisterNatives.
 
 static bool RegisterNativesImpl(JNIEnv* env) {
-
   g_InputStream_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kInputStreamClassPath).obj()));
+
   return true;
 }
+
 }  // namespace JNI_InputStream
 
 #endif  // java_io_InputStream_JNI