Revert "Add heap profiler events for jni generated functions"

This reverts commit affe36d3.

Reason for revert: Experimental CL. Reverting before branch cut.

Original change's description:
> Add heap profiler events for jni generated functions
>
> The native functions invoked are sometimes not run as a task which is
> registered with TaskAnnotator. Add events on generated jni functions to
> be able to trace them.
> Causes 80KB regression on the binary size, so use for temporary
> debugging in Dev channel and revert CL.
>
> BUG=801260
>
> Change-Id: I80931fc07d74ed27edebe3cf35bce689f8138099
> Reviewed-on: https://chromium-review.googlesource.com/853081
> Commit-Queue: Siddhartha S <ssid@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#531028}

TBR=ssid@chromium.org,agrieve@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 801260
Change-Id: I5fb690cb4fa24ee4f2305d2b90264cae40f3cefd
Reviewed-on: https://chromium-review.googlesource.com/938561Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Siddhartha S <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539329}

base/android/jni_generator/SampleForTests_jni.golden

@@ -109,7 +109,6 @@ JNI_GENERATOR_EXPORT jlong
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeInit(JNIEnv*
     env, jobject jcaller,
     jstring param) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_SampleForTests_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller), base::android::JavaParamRef<jstring>(env, param));
 }
@@ -118,7 +117,6 @@ JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeDestroy(JNIEnv*
     env, jobject jcaller,
     jlong nativeCPPClass) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Destroy");
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");
   return native->Destroy(env, base::android::JavaParamRef<jobject>(env,
@@ -131,7 +129,6 @@ static jdouble JNI_SampleForTests_GetDoubleFunction(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jdouble
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetDoubleFunction(JNIEnv*
     env, jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetDoubleFunction");
   return JNI_SampleForTests_GetDoubleFunction(env,
       base::android::JavaParamRef<jobject>(env, jcaller));
 }
@@ -142,7 +139,6 @@ static jfloat JNI_SampleForTests_GetFloatFunction(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jfloat
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetFloatFunction(JNIEnv*
     env, jclass jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetFloatFunction");
   return JNI_SampleForTests_GetFloatFunction(env,
       base::android::JavaParamRef<jclass>(env, jcaller));
 }
@@ -155,20 +151,18 @@ JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeSetNonPODDatatype(JNIEnv*
     env, jobject jcaller,
     jobject rect) {
-  TRACE_NATIVE_EXECUTION_SCOPED("SetNonPODDatatype");
   return JNI_SampleForTests_SetNonPODDatatype(env,
       base::android::JavaParamRef<jobject>(env, jcaller),
       base::android::JavaParamRef<jobject>(env, rect));
 }
 
 static base::android::ScopedJavaLocalRef<jobject>
-    JNI_SampleForTests_GetNonPODDatatype(JNIEnv* env, const
+JNI_SampleForTests_GetNonPODDatatype(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller);
 
 JNI_GENERATOR_EXPORT jobject
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetNonPODDatatype(JNIEnv*
     env, jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetNonPODDatatype");
   return JNI_SampleForTests_GetNonPODDatatype(env,
       base::android::JavaParamRef<jobject>(env, jcaller)).Release();
 }
@@ -177,7 +171,6 @@ JNI_GENERATOR_EXPORT jint
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethod(JNIEnv*
     env, jobject jcaller,
     jlong nativeCPPClass) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Method");
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
   return native->Method(env, base::android::JavaParamRef<jobject>(env,
@@ -188,7 +181,6 @@ JNI_GENERATOR_EXPORT jdouble
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethodOtherP0(JNIEnv*
     env, jobject jcaller,
     jlong nativePtr) {
-  TRACE_NATIVE_EXECUTION_SCOPED("MethodOtherP0");
   CPPClass::InnerClass* native =
       reinterpret_cast<CPPClass::InnerClass*>(nativePtr);
   CHECK_NATIVE_PTR(env, jcaller, native, "MethodOtherP0", 0);
@@ -201,7 +193,6 @@ JNI_GENERATOR_EXPORT void
     env, jobject jcaller,
     jlong nativeCPPClass,
     jobject b) {
-  TRACE_NATIVE_EXECUTION_SCOPED("AddStructB");
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "AddStructB");
   return native->AddStructB(env, base::android::JavaParamRef<jobject>(env,
@@ -212,7 +203,6 @@ JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeIterateAndDoSomethingWithStructB(JNIEnv*
     env, jobject jcaller,
     jlong nativeCPPClass) {
-  TRACE_NATIVE_EXECUTION_SCOPED("IterateAndDoSomethingWithStructB");
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "IterateAndDoSomethingWithStructB");
   return native->IterateAndDoSomethingWithStructB(env,
@@ -223,7 +213,6 @@ JNI_GENERATOR_EXPORT jstring
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeReturnAString(JNIEnv*
     env, jobject jcaller,
     jlong nativeCPPClass) {
-  TRACE_NATIVE_EXECUTION_SCOPED("ReturnAString");
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "ReturnAString", NULL);
   return native->ReturnAString(env, base::android::JavaParamRef<jobject>(env,
@@ -236,7 +225,6 @@ static jint JNI_InnerClass_GetInnerIntFunction(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024InnerClass_nativeGetInnerIntFunction(JNIEnv*
     env, jclass jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetInnerIntFunction");
   return JNI_InnerClass_GetInnerIntFunction(env,
       base::android::JavaParamRef<jclass>(env, jcaller));
 }

base/android/jni_generator/jni_generator.py

@@ -1044,10 +1044,6 @@ $CLOSE_NAMESPACE
     profiling_entered_native = ''
     if self.options.enable_profiling:
       profiling_entered_native = 'JNI_LINK_SAVED_FRAME_POINTER;'
-    # Temporary annotations for crbug.com/801260. Will be removed once the
-    # memory usage is understood.
-    trace_native_execution_scoped = (
-        'TRACE_NATIVE_EXECUTION_SCOPED("' + native.name + '");')
     values = {
         'RETURN': return_type,
         'RETURN_DECLARATION': return_declaration,
@@ -1059,7 +1055,6 @@ $CLOSE_NAMESPACE
         'POST_CALL': post_call,
         'STUB_NAME': self.helper.GetStubName(native),
         'PROFILING_ENTERED_NATIVE': profiling_entered_native,
-        'TRACE_NATIVE_EXECUTION_SCOPED': trace_native_execution_scoped,
     }
 
     if is_method:
@@ -1074,7 +1069,6 @@ $CLOSE_NAMESPACE
       template = Template("""\
 JNI_GENERATOR_EXPORT ${RETURN} ${STUB_NAME}(JNIEnv* env, ${PARAMS_IN_STUB}) {
   ${PROFILING_ENTERED_NATIVE}
-  ${TRACE_NATIVE_EXECUTION_SCOPED}
   ${P0_TYPE}* native = reinterpret_cast<${P0_TYPE}*>(${PARAM0_NAME});
   CHECK_NATIVE_PTR(env, jcaller, native, "${NAME}"${OPTIONAL_ERROR_RETURN});
   return native->${NAME}(${PARAMS_IN_CALL})${POST_CALL};
@@ -1086,7 +1080,6 @@ static ${RETURN_DECLARATION} ${IMPL_METHOD_NAME}(JNIEnv* env, ${PARAMS});
 
 JNI_GENERATOR_EXPORT ${RETURN} ${STUB_NAME}(JNIEnv* env, ${PARAMS_IN_STUB}) {
   ${PROFILING_ENTERED_NATIVE}
-  ${TRACE_NATIVE_EXECUTION_SCOPED}
   return ${IMPL_METHOD_NAME}(${PARAMS_IN_CALL})${POST_CALL};
 }
 """)

base/android/jni_generator/jni_generator_helper.h

@@ -11,7 +11,6 @@
 #include "base/android/jni_int_wrapper.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
-#include "base/trace_event/heap_profiler.h"
 #include "build/build_config.h"
 
 // Project-specific macros used by the header files generated by
@@ -39,9 +38,6 @@
 #define JNI_REGISTRATION_EXPORT
 #endif
 
-#define TRACE_NATIVE_EXECUTION_SCOPED(name) \
-  TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION heap_profiler_event(name);
-
 namespace jni_generator {
 
 inline void HandleRegistrationError(JNIEnv* env,

base/android/jni_generator/testInnerClassNatives.golden

@@ -54,7 +54,6 @@ static jint JNI_MyInnerClass_Init(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_TestJni_00024MyInnerClass_nativeInit(JNIEnv* env, jobject
     jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_MyInnerClass_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }

base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden

@@ -53,7 +53,6 @@ static jint JNI_TestJni_Init(JNIEnv* env, const
 
 JNI_GENERATOR_EXPORT jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env,
     jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_TestJni_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
@@ -64,7 +63,6 @@ static jint JNI_MyOtherInnerClass_Init(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_TestJni_00024MyOtherInnerClass_nativeInit(JNIEnv* env,
     jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_MyOtherInnerClass_Init(env,
       base::android::JavaParamRef<jobject>(env, jcaller));
 }

base/android/jni_generator/testInnerClassNativesMultiple.golden

@@ -71,7 +71,6 @@ static jint JNI_MyInnerClass_Init(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_TestJni_00024MyInnerClass_nativeInit(JNIEnv* env, jobject
     jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_MyInnerClass_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
@@ -82,7 +81,6 @@ static jint JNI_MyOtherInnerClass_Init(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_TestJni_00024MyOtherInnerClass_nativeInit(JNIEnv* env,
     jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_MyOtherInnerClass_Init(env,
       base::android::JavaParamRef<jobject>(env, jcaller));
 }

base/android/jni_generator/testMultipleJNIAdditionalImport.golden

@@ -40,7 +40,6 @@ JNI_GENERATOR_EXPORT void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv*
     env, jclass jcaller,
     jobject callback1,
     jobject callback2) {
-  TRACE_NATIVE_EXECUTION_SCOPED("DoSomething");
   return JNI_Foo_DoSomething(env, base::android::JavaParamRef<jclass>(env,
       jcaller), base::android::JavaParamRef<jobject>(env, callback1),
       base::android::JavaParamRef<jobject>(env, callback2));

base/android/jni_generator/testNativeExportsOnlyOption.golden

@@ -81,7 +81,6 @@ JNI_GENERATOR_EXPORT jint
     env, jobject jcaller,
     jlong nativeTest,
     jint arg1) {
-  TRACE_NATIVE_EXECUTION_SCOPED("StaticMethod");
   Test* native = reinterpret_cast<Test*>(nativeTest);
   CHECK_NATIVE_PTR(env, jcaller, native, "StaticMethod", 0);
   return native->StaticMethod(env, base::android::JavaParamRef<jobject>(env,
@@ -93,7 +92,6 @@ JNI_GENERATOR_EXPORT jint
     env, jobject jcaller,
     jlong nativeTest,
     jint arg1) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Method");
   Test* native = reinterpret_cast<Test*>(nativeTest);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
   return native->Method(env, base::android::JavaParamRef<jobject>(env, jcaller),
@@ -106,7 +104,6 @@ static jint JNI_MyInnerClass_Init(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyInnerClass_nativeInit(JNIEnv*
     env, jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_MyInnerClass_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
@@ -117,7 +114,6 @@ static jint JNI_MyOtherInnerClass_Init(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyOtherInnerClass_nativeInit(JNIEnv*
     env, jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_MyOtherInnerClass_Init(env,
       base::android::JavaParamRef<jobject>(env, jcaller));
 }

base/android/jni_generator/testNatives.golden

@@ -36,7 +36,6 @@ static jint JNI_TestJni_Init(JNIEnv* env, const
 
 JNI_GENERATOR_EXPORT jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env,
     jobject jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Init");
   return JNI_TestJni_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
@@ -44,7 +43,6 @@ JNI_GENERATOR_EXPORT jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env,
 JNI_GENERATOR_EXPORT void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Destroy");
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");
@@ -59,7 +57,6 @@ JNI_GENERATOR_EXPORT jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv*
     jstring title,
     jboolean isFolder,
     jlong parentId) {
-  TRACE_NATIVE_EXECUTION_SCOPED("AddBookmark");
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   CHECK_NATIVE_PTR(env, jcaller, native, "AddBookmark", 0);
@@ -69,7 +66,7 @@ JNI_GENERATOR_EXPORT jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv*
 }
 
 static base::android::ScopedJavaLocalRef<jstring>
-    JNI_TestJni_GetDomainAndRegistry(JNIEnv* env, const
+JNI_TestJni_GetDomainAndRegistry(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller,
     const base::android::JavaParamRef<jstring>& url);
 
@@ -77,7 +74,6 @@ JNI_GENERATOR_EXPORT jstring
     Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env, jclass
     jcaller,
     jstring url) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetDomainAndRegistry");
   return JNI_TestJni_GetDomainAndRegistry(env,
       base::android::JavaParamRef<jclass>(env, jcaller),
       base::android::JavaParamRef<jstring>(env, url)).Release();
@@ -93,14 +89,13 @@ JNI_GENERATOR_EXPORT void
     jclass jcaller,
     jbyteArray state,
     jint tab_index) {
-  TRACE_NATIVE_EXECUTION_SCOPED("CreateHistoricalTabFromState");
   return JNI_TestJni_CreateHistoricalTabFromState(env,
       base::android::JavaParamRef<jclass>(env, jcaller),
       base::android::JavaParamRef<jbyteArray>(env, state), tab_index);
 }
 
 static base::android::ScopedJavaLocalRef<jbyteArray>
-    JNI_TestJni_GetStateAsByteArray(JNIEnv* env, const
+JNI_TestJni_GetStateAsByteArray(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jobject>& view);
 
@@ -108,7 +103,6 @@ JNI_GENERATOR_EXPORT jbyteArray
     Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv* env, jobject
     jcaller,
     jobject view) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetStateAsByteArray");
   return JNI_TestJni_GetStateAsByteArray(env,
       base::android::JavaParamRef<jobject>(env, jcaller),
       base::android::JavaParamRef<jobject>(env, view)).Release();
@@ -121,7 +115,6 @@ static base::android::ScopedJavaLocalRef<jobjectArray>
 JNI_GENERATOR_EXPORT jobjectArray
     Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
     jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetAutofillProfileGUIDs");
   return JNI_TestJni_GetAutofillProfileGUIDs(env,
       base::android::JavaParamRef<jclass>(env, jcaller)).Release();
 }
@@ -136,7 +129,6 @@ JNI_GENERATOR_EXPORT void
     jcaller,
     jint sessionId,
     jobjectArray results) {
-  TRACE_NATIVE_EXECUTION_SCOPED("SetRecognitionResults");
   return JNI_TestJni_SetRecognitionResults(env,
       base::android::JavaParamRef<jobject>(env, jcaller), sessionId,
       base::android::JavaParamRef<jobjectArray>(env, results));
@@ -153,7 +145,6 @@ JNI_GENERATOR_EXPORT jlong
     jbyteArray favicon,
     jstring title,
     jobject visits) {
-  TRACE_NATIVE_EXECUTION_SCOPED("AddBookmarkFromAPI");
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   CHECK_NATIVE_PTR(env, jcaller, native, "AddBookmarkFromAPI", 0);
@@ -175,18 +166,16 @@ static jint JNI_TestJni_FindAll(JNIEnv* env, const
 JNI_GENERATOR_EXPORT jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env,
     jobject jcaller,
     jstring find) {
-  TRACE_NATIVE_EXECUTION_SCOPED("FindAll");
   return JNI_TestJni_FindAll(env, base::android::JavaParamRef<jobject>(env,
       jcaller), base::android::JavaParamRef<jstring>(env, find));
 }
 
 static base::android::ScopedJavaLocalRef<jobject>
-    JNI_TestJni_GetInnerClass(JNIEnv* env, const
+JNI_TestJni_GetInnerClass(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller);
 
 JNI_GENERATOR_EXPORT jobject
     Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass jcaller) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GetInnerClass");
   return JNI_TestJni_GetInnerClass(env, base::android::JavaParamRef<jclass>(env,
       jcaller)).Release();
 }
@@ -198,7 +187,6 @@ JNI_GENERATOR_EXPORT jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv*
     jstring selection,
     jobjectArray selectionArgs,
     jstring sortOrder) {
-  TRACE_NATIVE_EXECUTION_SCOPED("QueryBitmap");
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   CHECK_NATIVE_PTR(env, jcaller, native, "QueryBitmap", NULL);
@@ -215,7 +203,6 @@ JNI_GENERATOR_EXPORT void Java_org_chromium_TestJni_nativeGotOrientation(JNIEnv*
     jdouble alpha,
     jdouble beta,
     jdouble gamma) {
-  TRACE_NATIVE_EXECUTION_SCOPED("GotOrientation");
   DataFetcherImplAndroid* native =
       reinterpret_cast<DataFetcherImplAndroid*>(nativeDataFetcherImplAndroid);
   CHECK_NATIVE_PTR(env, jcaller, native, "GotOrientation");
@@ -232,7 +219,6 @@ JNI_GENERATOR_EXPORT jthrowable
     Java_org_chromium_TestJni_nativeMessWithJavaException(JNIEnv* env, jclass
     jcaller,
     jthrowable e) {
-  TRACE_NATIVE_EXECUTION_SCOPED("MessWithJavaException");
   return JNI_TestJni_MessWithJavaException(env,
       base::android::JavaParamRef<jclass>(env, jcaller),
       base::android::JavaParamRef<jthrowable>(env, e)).Release();

base/android/jni_generator/testNativesLong.golden

@@ -33,7 +33,6 @@ inline jclass org_chromium_TestJni_clazz(JNIEnv* env) {
 JNI_GENERATOR_EXPORT void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
     jobject jcaller,
     jlong nativeChromeBrowserProvider) {
-  TRACE_NATIVE_EXECUTION_SCOPED("Destroy");
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");

base/android/jni_generator/testSingleJNIAdditionalImport.golden

@@ -38,7 +38,6 @@ static void JNI_Foo_DoSomething(JNIEnv* env, const
 JNI_GENERATOR_EXPORT void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv*
     env, jclass jcaller,
     jobject callback) {
-  TRACE_NATIVE_EXECUTION_SCOPED("DoSomething");
   return JNI_Foo_DoSomething(env, base::android::JavaParamRef<jclass>(env,
       jcaller), base::android::JavaParamRef<jobject>(env, callback));
 }