Android: Update convenience macro defining JNI-accessible methods

webrtc/sdk/android/src/jni/androidmetrics_jni.cc

 /*
  *  Copyright 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <map>
 #include <memory>
 
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 
 // Enables collection of native histograms and creating them.
 namespace webrtc_jni {
 
-JOW(void, Metrics_nativeEnable)(JNIEnv* jni, jclass) {
+JNI_FUNCTION_DECLARATION(void, Metrics_nativeEnable, JNIEnv* jni, jclass) {
   webrtc::metrics::Enable();
 }
 
 // Gets and clears native histograms.
-JOW(jobject, Metrics_nativeGetAndReset)(JNIEnv* jni, jclass) {
+JNI_FUNCTION_DECLARATION(jobject,
+                         Metrics_nativeGetAndReset,
+                         JNIEnv* jni,
+                         jclass) {
   jclass j_metrics_class = jni->FindClass("org/webrtc/Metrics");
   jmethodID j_add =
       GetMethodID(jni, j_metrics_class, "add",
                   "(Ljava/lang/String;Lorg/webrtc/Metrics$HistogramInfo;)V");
   jclass j_info_class = jni->FindClass("org/webrtc/Metrics$HistogramInfo");
   jmethodID j_add_sample = GetMethodID(jni, j_info_class, "addSample", "(II)V");
 
   // Create |Metrics|.
   jobject j_metrics = jni->NewObject(
       j_metrics_class, GetMethodID(jni, j_metrics_class, "<init>", "()V"));
@@ skipping 14 matching lines @@
     jstring j_name = jni->NewStringUTF(kv.first.c_str());
     jni->CallVoidMethod(j_metrics, j_add, j_name, j_info);
     jni->DeleteLocalRef(j_name);
     jni->DeleteLocalRef(j_info);
   }
   CHECK_EXCEPTION(jni);
   return j_metrics;
 }
 
 }  // namespace webrtc_jni