Android: Update convenience macro defining JNI-accessible methods

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

Index: webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
diff --git a/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc b/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
index b80f4e3fbd3daa4f08f8d11c1b8a596bc71cec3d..7204de26ce160bbf679f3cfe7cd6d9ea0846ef9e 100644
--- a/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
+++ b/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
@@ -13,36 +13,56 @@
 
 namespace webrtc_jni {
 
-JOW(jboolean, MediaStream_nativeAddAudioTrack)
-(JNIEnv* jni, jclass, jlong pointer, jlong j_audio_track_pointer) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         MediaStream_nativeAddAudioTrack,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong pointer,
+                         jlong j_audio_track_pointer) {
   return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->AddTrack(
       reinterpret_cast<webrtc::AudioTrackInterface*>(j_audio_track_pointer));
 }
 
-JOW(jboolean, MediaStream_nativeAddVideoTrack)
-(JNIEnv* jni, jclass, jlong pointer, jlong j_video_track_pointer) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         MediaStream_nativeAddVideoTrack,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong pointer,
+                         jlong j_video_track_pointer) {
   return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->AddTrack(
       reinterpret_cast<webrtc::VideoTrackInterface*>(j_video_track_pointer));
 }
 
-JOW(jboolean, MediaStream_nativeRemoveAudioTrack)
-(JNIEnv* jni, jclass, jlong pointer, jlong j_audio_track_pointer) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         MediaStream_nativeRemoveAudioTrack,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong pointer,
+                         jlong j_audio_track_pointer) {
   return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->RemoveTrack(
       reinterpret_cast<webrtc::AudioTrackInterface*>(j_audio_track_pointer));
 }
 
-JOW(jboolean, MediaStream_nativeRemoveVideoTrack)
-(JNIEnv* jni, jclass, jlong pointer, jlong j_video_track_pointer) {
+JNI_FUNCTION_DECLARATION(jboolean,
+                         MediaStream_nativeRemoveVideoTrack,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong pointer,
+                         jlong j_video_track_pointer) {
   return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->RemoveTrack(
       reinterpret_cast<webrtc::VideoTrackInterface*>(j_video_track_pointer));
 }
 
-JOW(jstring, MediaStream_nativeLabel)(JNIEnv* jni, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(jstring,
+                         MediaStream_nativeLabel,
+                         JNIEnv* jni,
+                         jclass,
+                         jlong j_p) {
   return JavaStringFromStdString(
       jni, reinterpret_cast<webrtc::MediaStreamInterface*>(j_p)->label());
 }
 
-JOW(void, MediaStream_free)(JNIEnv*, jclass, jlong j_p) {
+JNI_FUNCTION_DECLARATION(void, MediaStream_free, JNIEnv*, jclass, jlong j_p) {
   CHECK_RELEASE(reinterpret_cast<webrtc::MediaStreamInterface*>(j_p));
 }