Android: Update convenience macro defining JNI-accessible methods

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

Index: webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc b/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
index 849cdbbfb47e588419e542a10a27b74de3e5fef7..182c5e2d77704b219f805806a7fca03f1e53443b 100644
--- a/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
+++ b/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc
@@ -13,32 +13,56 @@
 
 namespace webrtc_jni {
 
-JOW(void, MediaStreamTrack_free)(JNIEnv*, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(void,
+                         MediaStreamTrack_free,
+                         JNIEnv*,
+                         jclass,
+                         jlong j_p) {
   reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->Release();
 }
 
-JOW(jstring, MediaStreamTrack_nativeId)(JNIEnv* jni, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(jstring,
+                         MediaStreamTrack_nativeId,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_p) {
   return JavaStringFromStdString(
       jni, reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->id());
 }
 
-JOW(jstring, MediaStreamTrack_nativeKind)(JNIEnv* jni, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(jstring,
+                         MediaStreamTrack_nativeKind,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_p) {
   return JavaStringFromStdString(
       jni, reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->kind());
 }
 
-JOW(jboolean, MediaStreamTrack_nativeEnabled)(JNIEnv* jni, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         MediaStreamTrack_nativeEnabled,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_p) {
   return reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->enabled();
 }
 
-JOW(jobject, MediaStreamTrack_nativeState)(JNIEnv* jni, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(jobject,
+                         MediaStreamTrack_nativeState,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_p) {
   return JavaEnumFromIndexAndClassName(
       jni, "MediaStreamTrack$State",
       reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->state());
 }
 
-JOW(jboolean, MediaStreamTrack_nativeSetEnabled)
-(JNIEnv* jni, jclass, jlong j_p, jboolean enabled) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         MediaStreamTrack_nativeSetEnabled,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_p,
+                         jboolean enabled) {
   return reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->set_enabled(
       enabled);
 }