Android: lazy initialization for method id.

content/common/android/surface_callback.cc

 // 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.
 
 #include "content/common/android/surface_callback.h"
 
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "ui/gl/android_native_window.h"
 #include "jni/SurfaceCallback_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
-using base::android::GetMethodID;
+using base::android::GetClass;
+using base::android::MethodID;
 using base::WaitableEvent;
 using content::SurfaceTexturePeer;
 
 namespace content {
 
 namespace {
 
 struct GlobalState {
   base::Lock registration_lock;
   // We hold a reference to a message loop proxy which handles message loop
@@ skipping 36 matching lines @@
                   primaryID, secondaryID, NULL);
 }
 
 void ReleaseSurface(jobject surface) {
   if (surface == NULL)
     return;
 
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
 
-  jclass cls = env->FindClass("android/view/Surface");
-  DCHECK(cls);
+  ScopedJavaLocalRef<jclass> cls(GetClass(env, "android/view/Surface"));
 
-  jmethodID method = env->GetMethodID(cls, "release", "()V");
-  DCHECK(method);
+  jmethodID method = MethodID::Get<MethodID::TYPE_INSTANCE>(
+      env, cls.obj(), "release", "()V");
 
   env->CallVoidMethod(surface, method);
-  DCHECK(env);
-
-  env->DeleteLocalRef(cls);
 }
 
 void SetSurfaceAsync(JNIEnv* env,
                      jobject jsurface,
                      SurfaceTexturePeer::SurfaceTextureTarget type,
                      int primary_id,
                      int secondary_id,
                      WaitableEvent* completion) {
   base::AutoLock lock(g_state.Pointer()->registration_lock);
 
@@ skipping 50 matching lines @@
   base::AutoLock lock(global_state->registration_lock);
   global_state->native_window_loop = loop;
   global_state->native_window_callback = callback;
 }
 
 bool RegisterSurfaceCallback(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content