Android: adds Get(Static)MethodIDOrNULL.

base/android/jni_android.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 "base/android/jni_android.h"
 
 #include <map>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_string.h"
@@ skipping 147 matching lines @@
                       const char* method_name,
                       const char* jni_signature) {
   // clazz.env() can not be used as that may be from a different thread.
   return GetMethodID(env, clazz.obj(), method_name, jni_signature);
 }
 
 jmethodID GetMethodID(JNIEnv* env,
                       jclass clazz,
                       const char* method_name,
                       const char* jni_signature) {
-  jmethodID method_id =
-      env->GetMethodID(clazz, method_name, jni_signature);
-  CHECK(method_id && !ClearException(env)) << "Failed to find method " <<
+  jmethodID method_id = GetMethodIDOrNULL(
+      env, clazz, method_name, jni_signature);
+  CHECK(method_id) << "Failed to find method " <<
       method_name << " " << jni_signature;
   return method_id;
 }
 
+jmethodID GetMethodIDOrNULL(JNIEnv* env,
+                            jclass clazz,
+                            const char* method_name,
+                            const char* jni_signature) {
+  jmethodID method_id =
+      env->GetMethodID(clazz, method_name, jni_signature);
+  ClearException(env);

[Sami, 2012/10/01 11:32:15]

This causes some log spam which could be misleading if the caller is prepared to
handle the missing method. Should we only log if this is called from
GetMethodID?

[bulach, 2012/10/01 15:08:37]

good point! done..

+  return method_id;
+}
+
 jmethodID GetStaticMethodID(JNIEnv* env,
                             const JavaRef<jclass>& clazz,
                             const char* method_name,
                             const char* jni_signature) {
   return GetStaticMethodID(env, clazz.obj(), method_name,
       jni_signature);
 }
 
 jmethodID GetStaticMethodID(JNIEnv* env,
                             jclass clazz,
                             const char* method_name,
                             const char* jni_signature) {
-  jmethodID method_id =
-      env->GetStaticMethodID(clazz, method_name, jni_signature);
-  CHECK(method_id && !ClearException(env)) << "Failed to find static method " <<
+  jmethodID method_id = GetStaticMethodIDOrNULL(
+      env, clazz, method_name, jni_signature);
+  CHECK(method_id) << "Failed to find static method " <<
       method_name << " " << jni_signature;
   return method_id;
 }
 
+jmethodID GetStaticMethodIDOrNULL(JNIEnv* env,
+                                  jclass clazz,
+                                  const char* method_name,
+                                  const char* jni_signature) {
+  jmethodID method_id =
+      env->GetStaticMethodID(clazz, method_name, jni_signature);
+  ClearException(env);
+  return method_id;
+}
+
 bool HasMethod(JNIEnv* env,
                const JavaRef<jclass>& clazz,
                const char* method_name,
                const char* jni_signature) {
   jmethodID method_id =
       env->GetMethodID(clazz.obj(), method_name, jni_signature);
   if (!method_id) {
     ClearException(env);
     return false;
   }
@@ skipping 115 matching lines @@
   // RVO should avoid any extra copies of the exception string.
   base::android::BuildInfo::GetInstance()->set_java_exception_info(
       GetJavaExceptionInfo(env, java_throwable));
 
   // Now, feel good about it and die.
   CHECK(false);
 }
 
 }  // namespace android
 }  // namespace base