Index: base/android/locale_utils.cc |
diff --git a/base/android/locale_utils.cc b/base/android/locale_utils.cc |
index 2a7da8e8b94a99fb38a63435364647b18628c0ad..212536c5b893bf794e130ace6df96d0fd863daf8 100644 |
--- a/base/android/locale_utils.cc |
+++ b/base/android/locale_utils.cc |
@@ -69,16 +69,19 @@ string16 GetDisplayNameForLocale(const std::string& locale, |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jclass> locale_class = GetClass(env, "java/util/Locale"); |
- jmethodID constructor_id = GetMethodID( |
- env, locale_class, "<init>", |
- "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); |
+ jmethodID constructor_id = MethodID::Get< |
+ MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>( |
+ env, locale_class.obj(), "<init>", |
+ "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); |
ScopedJavaLocalRef<jobject> java_locale = NewJavaLocale( |
env, locale_class, constructor_id, locale); |
ScopedJavaLocalRef<jobject> java_display_locale = NewJavaLocale( |
env, locale_class, constructor_id, display_locale); |
- jmethodID method_id = GetMethodID(env, locale_class, "getDisplayName", |
- "(Ljava/util/Locale;)Ljava/lang/String;"); |
+ jmethodID method_id = MethodID::Get< |
+ MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>( |
+ env, locale_class.obj(), "getDisplayName", |
+ "(Ljava/util/Locale;)Ljava/lang/String;"); |
ScopedJavaLocalRef<jstring> java_result( |
env, |
static_cast<jstring>(env->CallObjectMethod(java_locale.obj(), method_id, |