Android: lazy initialization for method id.

ui/base/clipboard/clipboard_unittest.cc

Index: ui/base/clipboard/clipboard_unittest.cc
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index e8b3d39665348fec2eda434146d67e3bf04db46f..c066a3f5b4fa3e350aec5f361ce76baedc41d378 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -31,6 +31,10 @@
 #include "base/message_loop.h"
 #endif
 
+#if defined(OS_ANDROID)
+using base::android::MethodID;
+#endif

[joth, 2012/10/04 17:59:59]

nit: put this down inside the test where you use it. 'using' statements are fine
(in fact, nice) scoped inside a fn.

[bulach, 2012/10/04 18:58:17]

Done (indeed, there was already an "using" clause in the fn, thanks!)

+
 namespace ui {
 
 class ClipboardTest : public PlatformTest {
@@ -657,8 +661,10 @@ TEST_F(ClipboardTest, InternalClipboardInvalidation) {
   ScopedJavaLocalRef<jclass> context_class =
       base::android::GetClass(env, "android/content/Context");
 
-  jmethodID get_system_service = base::android::GetMethodID(env, context_class,
-      "getSystemService",  "(Ljava/lang/String;)Ljava/lang/Object;");
+  jmethodID get_system_service = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, context_class.obj(), "getSystemService",
+          "(Ljava/lang/String;)Ljava/lang/Object;");
 
   // Retrieve the system service.
   ScopedJavaLocalRef<jstring> service_name(env, env->NewStringUTF("clipboard"));
@@ -669,8 +675,9 @@ TEST_F(ClipboardTest, InternalClipboardInvalidation) {
 
   ScopedJavaLocalRef<jclass> clipboard_class =
       base::android::GetClass(env, "android/text/ClipboardManager");
-  jmethodID set_text = base::android::GetMethodID(env, clipboard_class,
-                          "setText", "(Ljava/lang/CharSequence;)V");
+  jmethodID set_text = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, clipboard_class.obj(), "setText", "(Ljava/lang/CharSequence;)V");
 
   // Will need to call toString as CharSequence is not always a String.
   env->CallVoidMethod(clipboard_manager.obj(),