Android: Update convenience macro defining JNI-accessible methods

webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc

Index: webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc b/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
index 1b4a2978334b9e37ab08e9aa1591a916acc0db92..b304956104329675d2ffdbed325caf56db52e597 100644
--- a/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
+++ b/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
@@ -13,44 +13,60 @@
 
 namespace webrtc_jni {
 
-JOW(jboolean, DtmfSender_nativeCanInsertDtmf)
-(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         DtmfSender_nativeCanInsertDtmf,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_dtmf_sender_pointer) {
   return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
       ->CanInsertDtmf();
 }
 
-JOW(jboolean, DtmfSender_nativeInsertDtmf)
-(JNIEnv* jni,
- jclass,
- jlong j_dtmf_sender_pointer,
- jstring tones,
- jint duration,
- jint inter_tone_gap) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         DtmfSender_nativeInsertDtmf,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_dtmf_sender_pointer,
+                         jstring tones,
+                         jint duration,
+                         jint inter_tone_gap) {
   return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
       ->InsertDtmf(JavaToStdString(jni, tones), duration, inter_tone_gap);
 }
 
-JOW(jstring, DtmfSender_nativeTones)
-(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
+JNI_FUNCTION_DECLARATION(jstring,
+                         DtmfSender_nativeTones,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_dtmf_sender_pointer) {
   return JavaStringFromStdString(
       jni, reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
                ->tones());
 }
 
-JOW(jint, DtmfSender_nativeDuration)
-(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
+JNI_FUNCTION_DECLARATION(jint,
+                         DtmfSender_nativeDuration,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_dtmf_sender_pointer) {
   return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
       ->duration();
 }
 
-JOW(jint, DtmfSender_nativeInterToneGap)
-(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
+JNI_FUNCTION_DECLARATION(jint,
+                         DtmfSender_nativeInterToneGap,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_dtmf_sender_pointer) {
   return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
       ->inter_tone_gap();
 }
 
-JOW(void, DtmfSender_free)
-(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
+JNI_FUNCTION_DECLARATION(void,
+                         DtmfSender_free,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_dtmf_sender_pointer) {
   reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
       ->Release();
 }