Fixes JNI Bindings & startup perf.

base/android/jni_generator/jni_generator_tests.py

 #!/usr/bin/python
 #
 # 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.
 
 """Tests for jni_generator.py.
 
 This test suite contains various tests for the JNI generator.
 It exercises the low-level parser all the way up to the
@@ skipping 29 matching lines @@
       else:
         self.assertEquals(first[i], second[i])
 
   def assertTextEquals(self, golden_text, generated_text):
     stripped_golden = [l.strip() for l in golden_text.split('\n')]
     stripped_generated = [l.strip() for l in generated_text.split('\n')]
     if stripped_golden != stripped_generated:
       print self.id()
       for line in difflib.context_diff(stripped_golden, stripped_generated):
         print line
+      print '\n\nGenerated'
+      print '=' * 80
+      print generated_text
+      print '=' * 80
       self.fail('Golden text mismatch')
 
   def testNatives(self):
     test_data = """"
     private native int nativeInit();
     private native void nativeDestroy(int nativeChromeBrowserProvider);
     private native long nativeAddBookmark(
             int nativeChromeBrowserProvider,
             String url, String title, boolean isFolder, long parentId);
     private static native String nativeGetDomainAndRegistry(String url);
@@ skipping 160 matching lines @@
 
 #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;
 
 // Step 1: forward declarations.
 namespace {
-const char* const kTestJniClassPath = "org/chromium/TestJni";
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_TestJni_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
+const char kTestJniClassPath[] = "org/chromium/TestJni";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_TestJni_clazz = NULL;
 }  // namespace
 
 static jint Init(JNIEnv* env, jobject obj);
 
 
 static jstring GetDomainAndRegistry(JNIEnv* env, jclass clazz,
     jstring url);
 
 
 static void CreateHistoricalTabFromState(JNIEnv* env, jclass clazz,
@@ skipping 79 matching lines @@
   device_orientation::DeviceOrientationAndroid* native =
     reinterpret_cast<device_orientation::DeviceOrientationAndroid*>(nativePtr);
   return native->GotOrientation(env, obj, alpha, beta, gamma);
 }
 
 
 // Step 3: GetMethodIDs and RegisterNatives.
 
 
 static void GetMethodIDsImpl(JNIEnv* env) {
-  g_TestJni_clazz.Reset(
-      base::android::GetClass(env, kTestJniClassPath));
+  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kTestJniClassPath)));
 }
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   GetMethodIDsImpl(env);
 
   static const JNINativeMethod kMethodsTestJni[] = {
     { "nativeInit",
 "("
 ")"
 "I", reinterpret_cast<void*>(Init) },
@@ skipping 73 matching lines @@
 "("
 "I"
 "D"
 "D"
 "D"
 ")"
 "V", reinterpret_cast<void*>(GotOrientation) },
   };
   const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
 
-  if (env->RegisterNatives(g_TestJni_clazz.obj(),
+  if (env->RegisterNatives(g_TestJni_clazz,
                            kMethodsTestJni,
                            kMethodsTestJniSize) < 0) {
     LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_TestJni_JNI
@@ skipping 35 matching lines @@
 
 #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;
 
 // Step 1: forward declarations.
 namespace {
-const char* const kTestJniClassPath = "org/chromium/TestJni";
-const char* const kMyInnerClassClassPath = "org/chromium/TestJni$MyInnerClass";
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_TestJni_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
+const char kTestJniClassPath[] = "org/chromium/TestJni";
+const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_TestJni_clazz = NULL;
 }  // namespace
 
 static jint Init(JNIEnv* env, jobject obj);
 
 
 // Step 2: method stubs.
 
 
 // Step 3: GetMethodIDs and RegisterNatives.
 
 
 static void GetMethodIDsImpl(JNIEnv* env) {
-  g_TestJni_clazz.Reset(
-      base::android::GetClass(env, kTestJniClassPath));
+  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kTestJniClassPath)));
 }
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   GetMethodIDsImpl(env);
 
   static const JNINativeMethod kMethodsMyInnerClass[] = {
     { "nativeInit",
 "("
 ")"
 "I", reinterpret_cast<void*>(Init) },
   };
   const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass);
 
-  if (env->RegisterNatives(g_MyInnerClass_clazz.obj(),
+  if (env->RegisterNatives(g_MyInnerClass_clazz,
                            kMethodsMyInnerClass,
                            kMethodsMyInnerClassSize) < 0) {
     LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_TestJni_JNI
@@ skipping 43 matching lines @@
 
 #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;
 
 // Step 1: forward declarations.
 namespace {
-const char* const kMyOtherInnerClassClassPath =
+const char kMyOtherInnerClassClassPath[] =
     "org/chromium/TestJni$MyOtherInnerClass";
-const char* const kTestJniClassPath = "org/chromium/TestJni";
-const char* const kMyInnerClassClassPath = "org/chromium/TestJni$MyInnerClass";
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_TestJni_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
+const char kTestJniClassPath[] = "org/chromium/TestJni";
+const char kMyInnerClassClassPath[] = "org/chromium/TestJni$MyInnerClass";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_TestJni_clazz = NULL;
 }  // namespace
 
 static jint Init(JNIEnv* env, jobject obj);
 
 
 static jint Init(JNIEnv* env, jobject obj);
 
 
 // Step 2: method stubs.
 
 
 // Step 3: GetMethodIDs and RegisterNatives.
 
 
 static void GetMethodIDsImpl(JNIEnv* env) {
-  g_TestJni_clazz.Reset(
-      base::android::GetClass(env, kTestJniClassPath));
+  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kTestJniClassPath)));
 }
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   GetMethodIDsImpl(env);
 
   static const JNINativeMethod kMethodsMyOtherInnerClass[] = {
     { "nativeInit",
 "("
 ")"
 "I", reinterpret_cast<void*>(Init) },
   };
   const int kMethodsMyOtherInnerClassSize =
       arraysize(kMethodsMyOtherInnerClass);
 
-  if (env->RegisterNatives(g_MyOtherInnerClass_clazz.obj(),
+  if (env->RegisterNatives(g_MyOtherInnerClass_clazz,
                            kMethodsMyOtherInnerClass,
                            kMethodsMyOtherInnerClassSize) < 0) {
     LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
     return false;
   }
 
   static const JNINativeMethod kMethodsMyInnerClass[] = {
     { "nativeInit",
 "("
 ")"
 "I", reinterpret_cast<void*>(Init) },
   };
   const int kMethodsMyInnerClassSize = arraysize(kMethodsMyInnerClass);
 
-  if (env->RegisterNatives(g_MyInnerClass_clazz.obj(),
+  if (env->RegisterNatives(g_MyInnerClass_clazz,
                            kMethodsMyInnerClass,
                            kMethodsMyInnerClassSize) < 0) {
     LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_TestJni_JNI
@@ skipping 42 matching lines @@
 
 #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;
 
 // Step 1: forward declarations.
 namespace {
-const char* const kMyOtherInnerClassClassPath =
+const char kMyOtherInnerClassClassPath[] =
     "org/chromium/TestJni$MyOtherInnerClass";
-const char* const kTestJniClassPath = "org/chromium/TestJni";
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_TestJni_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
+const char kTestJniClassPath[] = "org/chromium/TestJni";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_TestJni_clazz = NULL;
 }  // namespace
 
 static jint Init(JNIEnv* env, jobject obj);
 
 
 static jint Init(JNIEnv* env, jobject obj);
 
 
 // Step 2: method stubs.
 
 
 // Step 3: GetMethodIDs and RegisterNatives.
 
 
 static void GetMethodIDsImpl(JNIEnv* env) {
-  g_TestJni_clazz.Reset(
-      base::android::GetClass(env, kTestJniClassPath));
+  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kTestJniClassPath)));
 }
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   GetMethodIDsImpl(env);
 
   static const JNINativeMethod kMethodsMyOtherInnerClass[] = {
     { "nativeInit",
 "("
 ")"
 "I", reinterpret_cast<void*>(Init) },
   };
   const int kMethodsMyOtherInnerClassSize =
       arraysize(kMethodsMyOtherInnerClass);
 
-  if (env->RegisterNatives(g_MyOtherInnerClass_clazz.obj(),
+  if (env->RegisterNatives(g_MyOtherInnerClass_clazz,
                            kMethodsMyOtherInnerClass,
                            kMethodsMyOtherInnerClassSize) < 0) {
     LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
     return false;
   }
 
   static const JNINativeMethod kMethodsTestJni[] = {
     { "nativeInit",
 "("
 ")"
 "I", reinterpret_cast<void*>(Init) },
   };
   const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
 
-  if (env->RegisterNatives(g_TestJni_clazz.obj(),
+  if (env->RegisterNatives(g_TestJni_clazz,
                            kMethodsTestJni,
                            kMethodsTestJniSize) < 0) {
     LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_TestJni_JNI
@@ skipping 164 matching lines @@
 
 #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;
 
 // Step 1: forward declarations.
 namespace {
-const char* const kTestJniClassPath = "org/chromium/TestJni";
-const char* const kInfoBarClassPath = "org/chromium/TestJni$InfoBar";
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_TestJni_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_InfoBar_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
+const char kTestJniClassPath[] = "org/chromium/TestJni";
+const char kInfoBarClassPath[] = "org/chromium/TestJni$InfoBar";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_TestJni_clazz = NULL;
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_InfoBar_clazz = NULL;
 }  // namespace
 
 
 // Step 2: method stubs.
 
 static jmethodID g_TestJni_showConfirmInfoBar = 0;
 static ScopedJavaLocalRef<jobject> Java_TestJni_showConfirmInfoBar(JNIEnv* env,
     jobject obj, jint nativeInfoBar,
     jstring buttonOk,
     jstring buttonCancel,
     jstring title,
     jobject icon) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_TestJni_clazz.is_null());
+  DCHECK(g_TestJni_clazz);
   DCHECK(g_TestJni_showConfirmInfoBar);
   jobject ret =
     env->CallObjectMethod(obj,
       g_TestJni_showConfirmInfoBar, nativeInfoBar, buttonOk, buttonCancel,
           title, icon);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static jmethodID g_TestJni_showAutoLoginInfoBar = 0;
 static ScopedJavaLocalRef<jobject> Java_TestJni_showAutoLoginInfoBar(JNIEnv*
     env, jobject obj, jint nativeInfoBar,
     jstring realm,
     jstring account,
     jstring args) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_TestJni_clazz.is_null());
+  DCHECK(g_TestJni_clazz);
   DCHECK(g_TestJni_showAutoLoginInfoBar);
   jobject ret =
     env->CallObjectMethod(obj,
       g_TestJni_showAutoLoginInfoBar, nativeInfoBar, realm, account, args);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static jmethodID g_InfoBar_dismiss = 0;
 static void Java_InfoBar_dismiss(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_InfoBar_clazz.is_null());
+  DCHECK(g_InfoBar_clazz);
   DCHECK(g_InfoBar_dismiss);
 
   env->CallVoidMethod(obj,
       g_InfoBar_dismiss);
   base::android::CheckException(env);
 
 }
 
 static jmethodID g_TestJni_shouldShowAutoLogin = 0;
 static jboolean Java_TestJni_shouldShowAutoLogin(JNIEnv* env, jobject
     chromeView,
     jstring realm,
     jstring account,
     jstring args) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_TestJni_clazz.is_null());
+  DCHECK(g_TestJni_clazz);
   DCHECK(g_TestJni_shouldShowAutoLogin);
   jboolean ret =
-    env->CallStaticBooleanMethod(g_TestJni_clazz.obj(),
+    env->CallStaticBooleanMethod(g_TestJni_clazz,
       g_TestJni_shouldShowAutoLogin, chromeView, realm, account, args);
   base::android::CheckException(env);
   return ret;
 }
 
 static jmethodID g_TestJni_openUrl = 0;
 static ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv* env, jstring
     url) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_TestJni_clazz.is_null());
+  DCHECK(g_TestJni_clazz);
   DCHECK(g_TestJni_openUrl);
   jobject ret =
-    env->CallStaticObjectMethod(g_TestJni_clazz.obj(),
+    env->CallStaticObjectMethod(g_TestJni_clazz,
       g_TestJni_openUrl, url);
   base::android::CheckException(env);
   return ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static jmethodID g_TestJni_activateHardwareAcceleration = 0;
 static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj,
     jboolean activated,
     jint iPid,
     jint iType,
     jint iPrimaryID,
     jint iSecondaryID) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_TestJni_clazz.is_null());
+  DCHECK(g_TestJni_clazz);
   DCHECK(g_TestJni_activateHardwareAcceleration);
 
   env->CallVoidMethod(obj,
       g_TestJni_activateHardwareAcceleration, activated, iPid, iType,
           iPrimaryID, iSecondaryID);
   base::android::CheckException(env);
 
 }
 
 static jmethodID g_TestJni_uncheckedCall = 0;
 static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, jint iParam) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_TestJni_clazz.is_null());
+  DCHECK(g_TestJni_clazz);
   DCHECK(g_TestJni_uncheckedCall);
 
   env->CallVoidMethod(obj,
       g_TestJni_uncheckedCall, iParam);
 
 
 }
 
 // Step 3: GetMethodIDs and RegisterNatives.
 
 
 static void GetMethodIDsImpl(JNIEnv* env) {
-  g_TestJni_clazz.Reset(
-      base::android::GetClass(env, kTestJniClassPath));
-  g_InfoBar_clazz.Reset(
-      base::android::GetClass(env, kInfoBarClassPath));
-  g_TestJni_showConfirmInfoBar = base::android::GetMethodID(
-    env, g_TestJni_clazz,
-    "showConfirmInfoBar",
+  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kTestJniClassPath)));
+  g_InfoBar_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kInfoBarClassPath)));
+  g_TestJni_showConfirmInfoBar =
+      base::android::GetMethodID(
+          env, g_TestJni_clazz,
+          "showConfirmInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Landroid/graphics/Bitmap;"
 ")"
 "Lcom/android/chrome/infobar/InfoBarContainer$NativeInfoBar;");
 
-  g_TestJni_showAutoLoginInfoBar = base::android::GetMethodID(
-    env, g_TestJni_clazz,
-    "showAutoLoginInfoBar",
+  g_TestJni_showAutoLoginInfoBar =
+      base::android::GetMethodID(
+          env, g_TestJni_clazz,
+          "showAutoLoginInfoBar",
 
 "("
 "I"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
 "Lcom/android/chrome/infobar/InfoBarContainer$NativeInfoBar;");
 
-  g_InfoBar_dismiss = base::android::GetMethodID(
-    env, g_InfoBar_clazz,
-    "dismiss",
+  g_InfoBar_dismiss =
+      base::android::GetMethodID(
+          env, g_InfoBar_clazz,
+          "dismiss",
 
 "("
 ")"
 "V");
 
-  g_TestJni_shouldShowAutoLogin = base::android::GetStaticMethodID(
-    env, g_TestJni_clazz,
-    "shouldShowAutoLogin",
+  g_TestJni_shouldShowAutoLogin =
+      base::android::GetStaticMethodID(
+          env, g_TestJni_clazz,
+          "shouldShowAutoLogin",
 
 "("
 "Lorg/chromium/chromeview/ChromeView;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
 "Z");
 
-  g_TestJni_openUrl = base::android::GetStaticMethodID(
-    env, g_TestJni_clazz,
-    "openUrl",
+  g_TestJni_openUrl =
+      base::android::GetStaticMethodID(
+          env, g_TestJni_clazz,
+          "openUrl",
 
 "("
 "Ljava/lang/String;"
 ")"
 "Ljava/io/InputStream;");
 
-  g_TestJni_activateHardwareAcceleration = base::android::GetMethodID(
-    env, g_TestJni_clazz,
-    "activateHardwareAcceleration",
+  g_TestJni_activateHardwareAcceleration =
+      base::android::GetMethodID(
+          env, g_TestJni_clazz,
+          "activateHardwareAcceleration",
 
 "("
 "Z"
 "I"
 "I"
 "I"
 "I"
 ")"
 "V");
 
-  g_TestJni_uncheckedCall = base::android::GetMethodID(
-    env, g_TestJni_clazz,
-    "uncheckedCall",
+  g_TestJni_uncheckedCall =
+      base::android::GetMethodID(
+          env, g_TestJni_clazz,
+          "uncheckedCall",
 
 "("
 "I"
 ")"
 "V");
 
 }
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   GetMethodIDsImpl(env);
@@ skipping 84 matching lines @@
 
 #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;
 
 // Step 1: forward declarations.
 namespace {
-const char* const kInputStreamClassPath = "java/io/InputStream";
-// Leaking this JavaRef as we cannot use LazyInstance from some threads.
-base::android::ScopedJavaGlobalRef<jclass>&
-    g_InputStream_clazz =
-        *(new base::android::ScopedJavaGlobalRef<jclass>());
+const char kInputStreamClassPath[] = "java/io/InputStream";
+// Leaking this jclass as we cannot use LazyInstance from some threads.
+jclass g_InputStream_clazz = NULL;
 }  // namespace
 
 
 // Step 2: method stubs.
 
 static jmethodID 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.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_available);
   jint ret =
     env->CallIntMethod(obj,
       g_InputStream_available);
   base::android::CheckException(env);
   return ret;
 }
 
 static jmethodID 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.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_close);
 
   env->CallVoidMethod(obj,
       g_InputStream_close);
   base::android::CheckException(env);
 
 }
 
 static jmethodID 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.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_mark);
 
   env->CallVoidMethod(obj,
       g_InputStream_mark, p0);
   base::android::CheckException(env);
 
 }
 
 static jmethodID 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.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_markSupported);
   jboolean ret =
     env->CallBooleanMethod(obj,
       g_InputStream_markSupported);
   base::android::CheckException(env);
   return ret;
 }
 
 static jmethodID g_InputStream_read_pqI = 0;
 static jint Java_InputStream_read(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static jint Java_InputStream_read(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_InputStream_clazz.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_read_pqI);
   jint ret =
     env->CallIntMethod(obj,
       g_InputStream_read_pqI);
   base::android::CheckException(env);
   return ret;
 }
 
 static jmethodID g_InputStream_read_paBqI = 0;
 static jint Java_InputStream_read(JNIEnv* env, jobject obj, jbyteArray p0)
     __attribute__ ((unused));
 static jint Java_InputStream_read(JNIEnv* env, jobject obj, jbyteArray p0) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_InputStream_clazz.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_read_paBqI);
   jint ret =
     env->CallIntMethod(obj,
       g_InputStream_read_paBqI, p0);
   base::android::CheckException(env);
   return ret;
 }
 
 static jmethodID g_InputStream_read_paBIIqI = 0;
 static jint Java_InputStream_read(JNIEnv* env, jobject obj, jbyteArray p0,
     jint p1,
     jint p2) __attribute__ ((unused));
 static jint Java_InputStream_read(JNIEnv* env, jobject obj, jbyteArray p0,
     jint p1,
     jint p2) {
   /* Must call RegisterNativesImpl()  */
-  DCHECK(!g_InputStream_clazz.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_read_paBIIqI);
   jint ret =
     env->CallIntMethod(obj,
       g_InputStream_read_paBIIqI, p0, p1, p2);
   base::android::CheckException(env);
   return ret;
 }
 
 static jmethodID 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.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_reset);
 
   env->CallVoidMethod(obj,
       g_InputStream_reset);
   base::android::CheckException(env);
 
 }
 
 static jmethodID 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.is_null());
+  DCHECK(g_InputStream_clazz);
   DCHECK(g_InputStream_skip);
   jlong ret =
     env->CallLongMethod(obj,
       g_InputStream_skip, p0);
   base::android::CheckException(env);
   return ret;
 }
 
 // Step 3: GetMethodIDs and RegisterNatives.
 namespace JNI_InputStream {
 
 static void GetMethodIDsImpl(JNIEnv* env) {
-  g_InputStream_clazz.Reset(
-      base::android::GetClass(env, kInputStreamClassPath));
-  g_InputStream_available = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "available",
+  g_InputStream_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetUnscopedClass(env, kInputStreamClassPath)));
+  g_InputStream_available =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "available",
 
 "("
 ")"
 "I");
 
-  g_InputStream_close = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "close",
+  g_InputStream_close =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "close",
 
 "("
 ")"
 "V");
 
-  g_InputStream_mark = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "mark",
+  g_InputStream_mark =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "mark",
 
 "("
 "I"
 ")"
 "V");
 
-  g_InputStream_markSupported = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "markSupported",
+  g_InputStream_markSupported =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "markSupported",
 
 "("
 ")"
 "Z");
 
-  g_InputStream_read_pqI = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "read",
+  g_InputStream_read_pqI =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "read",
 
 "("
 ")"
 "I");
 
-  g_InputStream_read_paBqI = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "read",
+  g_InputStream_read_paBqI =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "read",
 
 "("
 "[B"
 ")"
 "I");
 
-  g_InputStream_read_paBIIqI = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "read",
+  g_InputStream_read_paBIIqI =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "read",
 
 "("
 "[B"
 "I"
 "I"
 ")"
 "I");
 
-  g_InputStream_reset = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "reset",
+  g_InputStream_reset =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "reset",
 
 "("
 ")"
 "V");
 
-  g_InputStream_skip = base::android::GetMethodID(
-    env, g_InputStream_clazz,
-    "skip",
+  g_InputStream_skip =
+      base::android::GetMethodID(
+          env, g_InputStream_clazz,
+          "skip",
 
 "("
 "J"
 ")"
 "J");
 
 }
 
 static bool RegisterNativesImpl(JNIEnv* env) {
   JNI_InputStream::GetMethodIDsImpl(env);
@@ skipping 52 matching lines @@
     self.assertRaises(SystemExit, jni_generator.CheckFilenames,
                       ['NotTheSame.java'], ['not_good.h'])
     self.assertRaises(SystemExit, jni_generator.CheckFilenames,
                       ['MissingJniSuffix.java'], ['missing_jni_suffix.h'])
     jni_generator.CheckFilenames(['ThisIsFine.java'], ['this_is_fine_jni.h'])
     jni_generator.CheckFilenames([], [])
 
 
 if __name__ == '__main__':
   unittest.main()