Index: chrome/browser/android/chrome_web_contents_delegate_android.cc |
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc |
index a063d6d65125300471fec3f4891f3726459163aa..7ce880dfd7a2fff53b9e309a38c92a618d59ea55 100644 |
--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc |
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc |
@@ -24,6 +24,7 @@ |
using base::android::AttachCurrentThread; |
using base::android::GetClass; |
+using base::android::MethodID; |
using base::android::ScopedJavaLocalRef; |
using content::FileChooserParams; |
using content::WebContents; |
@@ -142,8 +143,8 @@ void ChromeWebContentsDelegateAndroid::OnFindResultAvailable( |
ScopedJavaLocalRef<jclass> rect_clazz = |
GetClass(env, "android/graphics/Rect"); |
- jmethodID rect_constructor = |
- GetMethodID(env, rect_clazz, "<init>", "(IIII)V"); |
+ jmethodID rect_constructor = MethodID::Get<MethodID::TYPE_INSTANCE>( |
+ env, rect_clazz.obj(), "<init>", "(IIII)V"); |
ScopedJavaLocalRef<jobject> selection_rect = CreateAndroidRect( |
env, rect_clazz, rect_constructor, find_result->selection_rect()); |
@@ -152,8 +153,8 @@ void ChromeWebContentsDelegateAndroid::OnFindResultAvailable( |
ScopedJavaLocalRef<jclass> details_clazz = |
GetClass(env, "org/chromium/chrome/browser/FindNotificationDetails"); |
- jmethodID details_constructor = GetMethodID(env, details_clazz, "<init>", |
- "(ILandroid/graphics/Rect;IZ)V"); |
+ jmethodID details_constructor = MethodID::Get<MethodID::TYPE_INSTANCE>( |
+ env, details_clazz.obj(), "<init>", "(ILandroid/graphics/Rect;IZ)V"); |
ScopedJavaLocalRef<jobject> details_object( |
env, |
@@ -191,8 +192,8 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply( |
ScopedJavaLocalRef<jclass> rect_clazz = |
GetClass(env, "android/graphics/RectF"); |
- jmethodID rect_constructor = |
- GetMethodID(env, rect_clazz, "<init>", "(FFFF)V"); |
+ jmethodID rect_constructor = MethodID::Get<MethodID::TYPE_INSTANCE>( |
+ env, rect_clazz.obj(), "<init>", "(FFFF)V"); |
ScopedJavaLocalRef<jobjectArray> jrects(env, env->NewObjectArray( |
match_rects.rects().size(), rect_clazz.obj(), NULL)); |
@@ -213,7 +214,8 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply( |
ScopedJavaLocalRef<jclass> details_clazz = |
GetClass(env, "org/chromium/chrome/browser/FindMatchRectsDetails"); |
- jmethodID details_constructor = GetMethodID(env, details_clazz, "<init>", |
+ jmethodID details_constructor = MethodID::Get<MethodID::TYPE_INSTANCE>( |
+ env, details_clazz.obj(), "<init>", |
"(I[Landroid/graphics/RectF;Landroid/graphics/RectF;)V"); |
ScopedJavaLocalRef<jobject> details_object( |