Android: lazy initialization for method id.

ui/base/clipboard/clipboard_unittest.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 "build/build_config.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #endif
 
 #if defined(OS_WIN) || defined(USE_AURA)
 #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 {
  protected:
   Clipboard& clipboard() { return clipboard_; }
 
  private:
   MessageLoopForUI message_loop_;
   Clipboard clipboard_;
 };
@@ skipping 606 matching lines @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ASSERT_TRUE(env);
 
   jobject context = base::android::GetApplicationContext();
   ASSERT_TRUE(context);
 
   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"));
   ScopedJavaLocalRef<jobject> clipboard_manager(
       env, env->CallObjectMethod(
         context, get_system_service, service_name.obj()));
   ASSERT_TRUE(clipboard_manager.obj() && !base::android::ClearException(env));
 
   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(),
                       set_text,
                       env->NewStringUTF(new_value.c_str()));
 
   // The bitmap that should have been available should be gone.
   EXPECT_FALSE(clipboard().IsFormatAvailable(Clipboard::GetBitmapFormatType(),
                                              Clipboard::BUFFER_STANDARD));
 
   // Make sure some text is available
   EXPECT_TRUE(clipboard().IsFormatAvailable(
       Clipboard::GetPlainTextWFormatType(), Clipboard::BUFFER_STANDARD));
 
   // Make sure the text is what we inserted while simulating the other app
   std::string contents;
   clipboard().ReadAsciiText(Clipboard::BUFFER_STANDARD, &contents);
   EXPECT_EQ(contents, new_value);
 }
 #endif
 }  // namespace ui