Android: lazy initialization for method id.

content/browser/renderer_host/java/java_method.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/browser/renderer_host/java/java_method.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"  // For ReplaceSubstringsAfterOffset
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::GetClass;
-using base::android::GetMethodID;
 using base::android::GetMethodIDFromClassName;
-using base::android::GetStaticMethodID;
+using base::android::MethodID;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 const char kGetName[] = "getName";
 const char kGetDeclaringClass[] = "getDeclaringClass";
 const char kGetModifiers[] = "getModifiers";
 const char kGetParameterTypes[] = "getParameterTypes";
 const char kGetReturnType[] = "getReturnType";
@@ skipping 178 matching lines @@
                                    &return_type_);
 
   // Determine whether the method is static.
   jint modifiers = env->CallIntMethod(
       java_method_.obj(), GetMethodIDFromClassName(env,
                                                    kJavaLangReflectMethod,
                                                    kGetModifiers,
                                                    kReturningInteger));
   bool is_static = env->CallStaticBooleanMethod(
       g_java_lang_reflect_modifier_class.Get().obj(),
-      GetStaticMethodID(env, g_java_lang_reflect_modifier_class.Get(),
-                        kIsStatic,
-                        kIntegerReturningBoolean),
+      MethodID::Get<MethodID::TYPE_STATIC>(
+          env, g_java_lang_reflect_modifier_class.Get().obj(), kIsStatic,
+          kIntegerReturningBoolean),
       modifiers);
 
   // Get the ID for this method.
   ScopedJavaLocalRef<jclass> declaring_class(env, static_cast<jclass>(
       env->CallObjectMethod(java_method_.obj(), GetMethodIDFromClassName(
           env,
           kJavaLangReflectMethod,
           kGetDeclaringClass,
           kReturningJavaLangClass))));
   id_ = is_static ?
-      GetStaticMethodID(env, declaring_class, name_.c_str(),
-                        signature.c_str()) :
-      GetMethodID(env, declaring_class, name_.c_str(), signature.c_str());
+      MethodID::Get<MethodID::TYPE_STATIC>(
+          env, declaring_class.obj(), name_.c_str(), signature.c_str()) :
+      MethodID::Get<MethodID::TYPE_INSTANCE>(
+          env, declaring_class.obj(), name_.c_str(), signature.c_str());
   java_method_.Reset();
 }