Android: lazy initialization for method id.

sync/util/session_utils_android.cc

Index: sync/util/session_utils_android.cc
diff --git a/sync/util/session_utils_android.cc b/sync/util/session_utils_android.cc
index 69f1ae448a2581f4b7e341674ee51362778d3248..a5653bd6c377c98f25a711468650b94d9d646d55 100644
--- a/sync/util/session_utils_android.cc
+++ b/sync/util/session_utils_android.cc
@@ -17,6 +17,7 @@ using base::android::CheckException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 using base::android::GetClass;
+using base::android::MethodID;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
@@ -26,8 +27,10 @@ ScopedJavaLocalRef<jstring> GetAndroidIdJNI(
     JNIEnv* env, const JavaRef<jobject>& content_resolver) {
   ScopedJavaLocalRef<jclass> clazz(
       GetClass(env, "android/provider/Settings$Secure"));
-  jmethodID j_get_string = GetStaticMethodID(env, clazz, "getString",
-      "(Landroid/content/ContentResolver;Ljava/lang/String;)"
+  jmethodID j_get_string = MethodID::Get<
+      MethodID::METHODTYPE_STATIC, MethodID::EXCEPTIONCHECK_YES>(
+          env, clazz.obj(), "getString",
+          "(Landroid/content/ContentResolver;Ljava/lang/String;)"
           "Ljava/lang/String;");
   ScopedJavaLocalRef<jstring> j_android_id =
       ConvertUTF8ToJavaString(env, "android_id");
@@ -41,8 +44,10 @@ ScopedJavaLocalRef<jstring> GetAndroidIdJNI(
 
 ScopedJavaLocalRef<jobject> GetContentResolver(JNIEnv* env) {
   ScopedJavaLocalRef<jclass> clazz(GetClass(env, "android/content/Context"));
-  jmethodID j_get_content_resolver_method = GetMethodID(
-      env, clazz,"getContentResolver", "()Landroid/content/ContentResolver;");
+  jmethodID j_get_content_resolver_method = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, clazz.obj(), "getContentResolver",
+          "()Landroid/content/ContentResolver;");
   jobject content_resolver = env->CallObjectMethod(
       GetApplicationContext(), j_get_content_resolver_method);
   CheckException(env);