Android: lazy initialization for method id.

Rather than requiring early registration for all method id, we can initialize
them lazily as required.
This solves the problem of building against SDK X but running against X - 1.
Also adds a microbenchmark to ensure there are no considerable regressions.
Results are a bit variable, but it hovers over:
[ERROR:jni_android_unittest.cc(125)] JNI LazyMethodIDCall (us) 1983
[ERROR:jni_android_unittest.cc(127)] JNI MethodIDCall (us) 1862

BUG=152987
TEST=JNIAndroidMicrobenchmark.MethodId
TBR=akalin

Review URL: https://chromiumcodereview.appspot.com/11038015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162186 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 9 deletions

diff --git a/content/common/android/surface_callback.cc b/content/common/android/surface_callback.cc
index 77757e9..7bfd033 100644
--- a/content/common/android/surface_callback.cc
+++ b/content/common/android/surface_callback.cc
@@ -19,7 +19,8 @@
 
 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;
 
@@ -76,16 +77,12 @@ void ReleaseSurface(jobject surface) {
   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,
diff --git a/content/common/android/surface_texture_bridge.cc b/content/common/android/surface_texture_bridge.cc
index bc17c13..8f640f8 100644
--- a/content/common/android/surface_texture_bridge.cc
+++ b/content/common/android/surface_texture_bridge.cc
@@ -12,7 +12,6 @@
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::GetClass;
-using base::android::GetMethodID;
 using base::android::ScopedJavaLocalRef;
 
 namespace {