Android: lazy initialization for method id.

chrome/browser/android/chrome_web_contents_delegate_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 "chrome/browser/android/chrome_web_contents_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
 #include "chrome/browser/ui/find_bar/find_match_rects_details.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/file_chooser_params.h"
 #include "jni/ChromeWebContentsDelegateAndroid_jni.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 
 using base::android::AttachCurrentThread;
 using base::android::GetClass;
+using base::android::MethodID;
 using base::android::ScopedJavaLocalRef;
 using content::FileChooserParams;
 using content::WebContents;
 
 namespace {
 
 // Convenience method to create Android rects.
 // RectType should be either gfx::Rect or gfx::RectF.
 template <typename RectType>
 ScopedJavaLocalRef<jobject> CreateAndroidRect(
@@ skipping 98 matching lines @@
     const FindNotificationDetails* find_result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
 
   // Create the selection rect.
   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::METHODTYPE_NORMAL>(
+      env, rect_clazz.obj(), "<init>", "(IIII)V");
 
   ScopedJavaLocalRef<jobject> selection_rect = CreateAndroidRect(
       env, rect_clazz, rect_constructor, find_result->selection_rect());
 
   // Create the details object.
   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::METHODTYPE_NORMAL>(
+      env, details_clazz.obj(), "<init>", "(ILandroid/graphics/Rect;IZ)V");
 
   ScopedJavaLocalRef<jobject> details_object(
       env,
       env->NewObject(details_clazz.obj(),
                      details_constructor,
                      find_result->number_of_matches(),
                      selection_rect.obj(),
                      find_result->active_match_ordinal(),
                      find_result->final_update()));
   DCHECK(!details_object.is_null());
@@ skipping 17 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
 
   // Create the rects.
   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::METHODTYPE_NORMAL>(
+      env, rect_clazz.obj(), "<init>", "(FFFF)V");
 
   ScopedJavaLocalRef<jobjectArray> jrects(env, env->NewObjectArray(
       match_rects.rects().size(), rect_clazz.obj(), NULL));
 
   for (size_t i = 0; i < match_rects.rects().size(); ++i) {
     env->SetObjectArrayElement(
         jrects.obj(), i,
         CreateAndroidRect(env,
                           rect_clazz,
                           rect_constructor,
                           match_rects.rects()[i]).obj());
   }
 
   ScopedJavaLocalRef<jobject> jactive_rect = CreateAndroidRect(
       env, rect_clazz, rect_constructor, match_rects.active_rect());
 
   // Create the details object.
   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::METHODTYPE_NORMAL>(
+      env, details_clazz.obj(), "<init>",
       "(I[Landroid/graphics/RectF;Landroid/graphics/RectF;)V");
 
   ScopedJavaLocalRef<jobject> details_object(
       env,
       env->NewObject(details_clazz.obj(),
                      details_constructor,
                      match_rects.version(),
                      jrects.obj(),
                      jactive_rect.obj()));
   DCHECK(!details_object.is_null());
 
   Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable(
       env,
       obj.obj(),
       details_object.obj());
 }
 
 content::JavaScriptDialogCreator*
 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogCreator() {
   return GetJavaScriptDialogCreatorInstance();
 }
 
 }  // namespace android
 }  // namespace chrome