Update from https://crrev.com/307758

base/android/trace_event_binding.cc

Index: base/android/trace_event_binding.cc
diff --git a/base/android/trace_event_binding.cc b/base/android/trace_event_binding.cc
index 216ba7b096d96ab0b66c175108447c76f86730d7..900ea52f2901d7462d64a10bde1563896aca4449 100644
--- a/base/android/trace_event_binding.cc
+++ b/base/android/trace_event_binding.cc
@@ -129,36 +129,14 @@ static void EndToplevel(JNIEnv* env, jclass clazz) {
   TRACE_EVENT_END0(kToplevelCategory, kLooperDispatchMessage);
 }
 
-static void StartAsync(JNIEnv* env, jclass clazz,
-                       jstring jname, jlong jid, jstring jarg) {
-  TraceEventDataConverter converter(env, jname, jarg);
-  if (converter.arg()) {
-    TRACE_EVENT_COPY_ASYNC_BEGIN1(kJavaCategory,
-                                  converter.name(),
-                                  jid,
-                                  converter.arg_name(),
-                                  converter.arg());
-  } else {
-    TRACE_EVENT_COPY_ASYNC_BEGIN0(kJavaCategory,
-                                  converter.name(),
-                                  jid);
-  }
+static void StartAsync(JNIEnv* env, jclass clazz, jstring jname, jlong jid) {
+  TraceEventDataConverter converter(env, jname, nullptr);
+  TRACE_EVENT_COPY_ASYNC_BEGIN0(kJavaCategory, converter.name(), jid);
 }
 
-static void FinishAsync(JNIEnv* env, jclass clazz,
-                        jstring jname, jlong jid, jstring jarg) {
-  TraceEventDataConverter converter(env, jname, jarg);
-  if (converter.arg()) {
-    TRACE_EVENT_COPY_ASYNC_END1(kJavaCategory,
-                                converter.name(),
-                                jid,
-                                converter.arg_name(),
-                                converter.arg());
-  } else {
-    TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory,
-                                converter.name(),
-                                jid);
-  }
+static void FinishAsync(JNIEnv* env, jclass clazz, jstring jname, jlong jid) {
+  TraceEventDataConverter converter(env, jname, nullptr);
+  TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, converter.name(), jid);
 }
 
 bool RegisterTraceEvent(JNIEnv* env) {