Remove unneeded JNI registrations.

base/android/jni_generator/testNatives.golden

Index: base/android/jni_generator/testNatives.golden
diff --git a/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden
index de109e703d1b209307f6333bc6ef1324495f455e..f6295896c0d8bf8536dca22450d95c03637fe801 100644
--- a/base/android/jni_generator/testNatives.golden
+++ b/base/android/jni_generator/testNatives.golden
@@ -16,34 +16,63 @@
 
 // Step 1: forward declarations.
 namespace {
-const char kTestJniClassPath[] = "org/chromium/TestJni";
-// Leaking this jclass as we cannot use LazyInstance from some threads.
-jclass g_TestJni_clazz = NULL;
 
 }  // namespace
 
+extern "C"{
+
 static jint Init(JNIEnv* env, jobject jcaller);
+__attribute__((alias("Init"), visibility("default"))) jint
+    Java_org_chromium_TestJni_nativeInit(JNIEnv* env, jobject jcaller);
 
 static jstring GetDomainAndRegistry(JNIEnv* env, jclass jcaller,
     jstring url);
+__attribute__((alias("GetDomainAndRegistry"), visibility("default"))) jstring
+    Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env, jclass
+        jcaller,
+    jstring url);
 
 static void CreateHistoricalTabFromState(JNIEnv* env, jclass jcaller,
     jbyteArray state,
     jint tab_index);
+__attribute__((alias("CreateHistoricalTabFromState"), visibility("default")))
+    void
+    Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv* env,
+        jclass jcaller,
+    jbyteArray state,
+    jint tab_index);
 
 static jbyteArray GetStateAsByteArray(JNIEnv* env, jobject jcaller,
     jobject view);
+__attribute__((alias("GetStateAsByteArray"), visibility("default"))) jbyteArray
+    Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv* env, jobject
+        jcaller,
+    jobject view);
 
 static jobjectArray GetAutofillProfileGUIDs(JNIEnv* env, jclass jcaller);
+__attribute__((alias("GetAutofillProfileGUIDs"), visibility("default")))
+    jobjectArray
+    Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
+        jcaller);
 
 static void SetRecognitionResults(JNIEnv* env, jobject jcaller,
     jint sessionId,
     jobjectArray results);
+__attribute__((alias("SetRecognitionResults"), visibility("default"))) void
+    Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, jobject
+        jcaller,
+    jint sessionId,
+    jobjectArray results);
 
 static jint FindAll(JNIEnv* env, jobject jcaller,
     jstring find);
+__attribute__((alias("FindAll"), visibility("default"))) jint
+    Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject jcaller,
+    jstring find);
 
 static jobject GetInnerClass(JNIEnv* env, jclass jcaller);
+__attribute__((alias("GetInnerClass"), visibility("default"))) jobject
+    Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass jcaller);
 
 // Step 2: method stubs.
 static void Destroy(JNIEnv* env, jobject jcaller,
@@ -53,6 +82,10 @@ static void Destroy(JNIEnv* env, jobject jcaller,
   CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");
   return native->Destroy(env, jcaller);
 }
+__attribute__((alias("Destroy"), visibility("default")))
+  void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
+      jobject jcaller,
+    jint nativeChromeBrowserProvider);
 
 static jlong AddBookmark(JNIEnv* env, jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -65,6 +98,14 @@ static jlong AddBookmark(JNIEnv* env, jobject jcaller,
   CHECK_NATIVE_PTR(env, jcaller, native, "AddBookmark", 0);
   return native->AddBookmark(env, jcaller, url, title, isFolder, parentId);
 }
+__attribute__((alias("AddBookmark"), visibility("default")))
+  jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv* env,
+      jobject jcaller,
+    jint nativeChromeBrowserProvider,
+    jstring url,
+    jstring title,
+    jboolean isFolder,
+    jlong parentId);
 
 static jlong AddBookmarkFromAPI(JNIEnv* env, jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -81,6 +122,17 @@ static jlong AddBookmarkFromAPI(JNIEnv* env, jobject jcaller,
   return native->AddBookmarkFromAPI(env, jcaller, url, created, isBookmark,
       date, favicon, title, visits);
 }
+__attribute__((alias("AddBookmarkFromAPI"), visibility("default")))
+  jlong Java_org_chromium_TestJni_nativeAddBookmarkFromAPI(JNIEnv* env,
+      jobject jcaller,
+    jint nativeChromeBrowserProvider,
+    jstring url,
+    jobject created,
+    jobject isBookmark,
+    jobject date,
+    jbyteArray favicon,
+    jstring title,
+    jobject visits);
 
 static jobject QueryBitmap(JNIEnv* env, jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -94,6 +146,14 @@ static jobject QueryBitmap(JNIEnv* env, jobject jcaller,
   return native->QueryBitmap(env, jcaller, projection, selection, selectionArgs,
       sortOrder).Release();
 }
+__attribute__((alias("QueryBitmap"), visibility("default")))
+  jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
+      jobject jcaller,
+    jint nativeChromeBrowserProvider,
+    jobjectArray projection,
+    jstring selection,
+    jobjectArray selectionArgs,
+    jstring sortOrder);
 
 static void GotOrientation(JNIEnv* env, jobject jcaller,
     jint nativeDataFetcherImplAndroid,
@@ -105,110 +165,16 @@ static void GotOrientation(JNIEnv* env, jobject jcaller,
   CHECK_NATIVE_PTR(env, jcaller, native, "GotOrientation");
   return native->GotOrientation(env, jcaller, alpha, beta, gamma);
 }
+__attribute__((alias("GotOrientation"), visibility("default")))
+  void Java_org_chromium_TestJni_nativeGotOrientation(JNIEnv* env,
+      jobject jcaller,
+    jint nativeDataFetcherImplAndroid,
+    jdouble alpha,
+    jdouble beta,
+    jdouble gamma);
 
-// Step 3: RegisterNatives.
-
-static const JNINativeMethod kMethodsTestJni[] = {
-    { "nativeInit",
-"("
-")"
-"I", reinterpret_cast<void*>(Init) },
-    { "nativeDestroy",
-"("
-"I"
-")"
-"V", reinterpret_cast<void*>(Destroy) },
-    { "nativeAddBookmark",
-"("
-"I"
-"Ljava/lang/String;"
-"Ljava/lang/String;"
-"Z"
-"J"
-")"
-"J", reinterpret_cast<void*>(AddBookmark) },
-    { "nativeGetDomainAndRegistry",
-"("
-"Ljava/lang/String;"
-")"
-"Ljava/lang/String;", reinterpret_cast<void*>(GetDomainAndRegistry) },
-    { "nativeCreateHistoricalTabFromState",
-"("
-"[B"
-"I"
-")"
-"V", reinterpret_cast<void*>(CreateHistoricalTabFromState) },
-    { "nativeGetStateAsByteArray",
-"("
-"Landroid/view/View;"
-")"
-"[B", reinterpret_cast<void*>(GetStateAsByteArray) },
-    { "nativeGetAutofillProfileGUIDs",
-"("
-")"
-"[Ljava/lang/String;", reinterpret_cast<void*>(GetAutofillProfileGUIDs) },
-    { "nativeSetRecognitionResults",
-"("
-"I"
-"[Ljava/lang/String;"
-")"
-"V", reinterpret_cast<void*>(SetRecognitionResults) },
-    { "nativeAddBookmarkFromAPI",
-"("
-"I"
-"Ljava/lang/String;"
-"Ljava/lang/Long;"
-"Ljava/lang/Boolean;"
-"Ljava/lang/Long;"
-"[B"
-"Ljava/lang/String;"
-"Ljava/lang/Integer;"
-")"
-"J", reinterpret_cast<void*>(AddBookmarkFromAPI) },
-    { "nativeFindAll",
-"("
-"Ljava/lang/String;"
-")"
-"I", reinterpret_cast<void*>(FindAll) },
-    { "nativeGetInnerClass",
-"("
-")"
-"Lorg/chromium/example/jni_generator/SampleForTests$OnFrameAvailableListener;",
-    reinterpret_cast<void*>(GetInnerClass) },
-    { "nativeQueryBitmap",
-"("
-"I"
-"[Ljava/lang/String;"
-"Ljava/lang/String;"
-"[Ljava/lang/String;"
-"Ljava/lang/String;"
-")"
-"Landroid/graphics/Bitmap;", reinterpret_cast<void*>(QueryBitmap) },
-    { "nativeGotOrientation",
-"("
-"I"
-"D"
-"D"
-"D"
-")"
-"V", reinterpret_cast<void*>(GotOrientation) },
 };
 
-static bool RegisterNativesImpl(JNIEnv* env) {
-  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
-      base::android::GetClass(env, kTestJniClassPath).obj()));
-
-  const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
-
-  if (env->RegisterNatives(g_TestJni_clazz,
-                           kMethodsTestJni,
-                           kMethodsTestJniSize) < 0) {
-    jni_generator::HandleRegistrationError(
-        env, g_TestJni_clazz, __FILE__);
-    return false;
-  }
-
-  return true;
-}
+// Step 3: RegisterNatives.
 
 #endif  // org_chromium_TestJni_JNI